cross-solution / YAWIK

module/Auth/src/Auth/Repository/User.php

Doc Comments +5 added lines, -5 removed lines

@@ -52,7 +52,7 @@ 
      * @throws Mapping\MappingException
      * @throws LockException
      * @throws UserDeactivatedException
-     * @return null | UserInterface
+     * @return null|UserInterface | UserInterface
      */
     public function find($id, $lockMode = \Doctrine\ODM\MongoDB\LockMode::NONE, $lockVersion = null, array $options = [])
     {
@@ -63,7 +63,7 @@ 
      * @param array $criteria
      * @param array $options
      * @throws UserDeactivatedException
-     * @return null | UserInterface
+     * @return null|UserInterface | UserInterface
      */
     public function findOneBy(array $criteria, array $options = [])
     {
@@ -92,7 +92,7 @@ 
      * Creates a User
      *
      * @see \Core\Repository\AbstractRepository::create()
-     * @return UserInterface
+     * @return \Core\Entity\EntityInterface
      */
     public function create(array $data = null)
     {
@@ -156,7 +156,7 @@ 
     }
 
     /**
-     * @param      $email
+     * @param      string $email
      * @param bool $isDraft
      *
      * @return UserInterface|null
@@ -267,7 +267,7 @@ 
      * @param UserInterface $user
      * @param array $options
      * @throws UserDeactivatedException
-     * @return null | UserInterface
+     * @return null|UserInterface | UserInterface
      */
     protected function assertEntity(UserInterface $user = null, array $options)
     {

Spacing +5 added lines, -5 removed lines

@@ -116,7 +116,7 @@ 
      */
     public function findByProfileIdentifier($identifier, $provider, array $options = [])
     {
-        return $this->findOneBy(array('profiles.' . $provider . '.auth.identifier' => $identifier), $options) ?: $this->findOneBy(array('profile.identifier' => $identifier), $options);
+        return $this->findOneBy(array('profiles.'.$provider.'.auth.identifier' => $identifier), $options) ?: $this->findOneBy(array('profile.identifier' => $identifier), $options);
     }
     
     /**
@@ -133,7 +133,7 @@ 
         $qb->field('_id')->notEqual($curentUserId)
             ->addAnd(
                 $qb->expr()
-                    ->addOr($qb->expr()->field('profiles.' . $provider . '.auth.identifier' )->equals($identifier))
+                    ->addOr($qb->expr()->field('profiles.'.$provider.'.auth.identifier')->equals($identifier))
                     ->addOr($qb->expr()->field('profile.identifier')->equals($identifier))
             );
         
@@ -189,7 +189,7 @@ 
         return $this->findOneBy(
             array(
             '$or' => array(
-                array('login' => $identity . $suffix),
+                array('login' => $identity.$suffix),
                 array('info.email' => $identity)
             )
             )
@@ -238,10 +238,10 @@ 
     public function findByQuery($query)
     {
         $qb = $this->createQueryBuilder();
-        $parts  = explode(' ', trim($query));
+        $parts = explode(' ', trim($query));
         
         foreach ($parts as $q) {
-            $regex = new \MongoRegex('/^' . $query . '/i');
+            $regex = new \MongoRegex('/^'.$query.'/i');
             $qb->addOr($qb->expr()->field('info.firstName')->equals($regex));
             $qb->addOr($qb->expr()->field('info.lastName')->equals($regex));
             $qb->addOr($qb->expr()->field('info.email')->equals($regex));

module/Auth/src/Auth/Factory/Listener/ExceptionStrategyFactory.php

Spacing +1 added lines, -1 removed lines

@@ -37,7 +37,7 @@
             break;
         }
         
-        $config   = $serviceLocator->get('Config');
+        $config = $serviceLocator->get('Config');
          
         if (isset($config['view_manager'])) {
             if (isset($config['view_manager']['display_exceptions'])) {

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

Spacing +35 added lines, -35 removed lines

@@ -31,8 +31,8 @@ 
 class IndexController extends AbstractActionController
 {
 
-    const LOGIN='login';
-    const REGISTER='register';
+    const LOGIN = 'login';
+    const REGISTER = 'register';
 
     /**
      * @var AuthenticationService
@@ -88,7 +88,7 @@ 
         $registerForm = $this->forms[self::REGISTER];
 
         /* @var $request \Zend\Http\Request */
-        $request   = $this->getRequest();
+        $request = $this->getRequest();
 
         if ($request->isPost()) {
             $data                          = $this->params()->fromPost();
@@ -106,7 +106,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']);
             }
             
@@ -122,19 +122,19 @@ 
                     $headers = $request->getHeaders();
                     if ($headers->has('Accept-Language')) {
                         $locales = $headers->get('Accept-Language')->getPrioritized();
-                        $language  = $locales[0]->type;
+                        $language = $locales[0]->type;
                     } else {
                         $language = 'en';
                     }
                 }
-                $this->logger->info('User ' . $user->login . ' logged in');
+                $this->logger->info('User '.$user->login.' 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 = $services->get('ViewHelperManager')->get('url');
                     $url = $urlHelper('lang', array('lang' => $language));
@@ -144,9 +144,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.');
             }
         }
@@ -205,11 +205,11 @@ 
             try {
                 $user          = $auth->getUser();
                 $password      = substr(md5(uniqid()), 0, 6);
-                $login         = uniqid() . ($this->options->auth_suffix != "" ? '@' . $this->options->auth_suffix : '');
-                $externalLogin = isset($user->login)?$user->login:'-- not communicated --';
-                $this->logger->debug('first login via ' . $provider . ' as: ' . $externalLogin);
+                $login         = uniqid().($this->options->auth_suffix != "" ? '@'.$this->options->auth_suffix : '');
+                $externalLogin = isset($user->login) ? $user->login : '-- not communicated --';
+                $this->logger->debug('first login via '.$provider.' as: '.$externalLogin);
 
-                $user->login=$login;
+                $user->login = $login;
                 $user->setPassword($password);
                 $user->setRole($this->options->getRole());
 
@@ -226,11 +226,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);
@@ -241,11 +241,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 . '$1', $ref);
+            $ref = preg_replace('~^'.$basePath.'/[a-z]{2}(/)?~', $basePath.'/'.$settings->localization->language.'$1', $ref);
         }
         return $this->redirect()->toUrl($ref);
     }
@@ -277,8 +277,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
@@ -309,7 +309,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];
@@ -333,7 +333,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);
@@ -348,8 +348,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(403);
@@ -374,8 +374,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',
                 )
@@ -384,7 +384,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
@@ -405,16 +405,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;
                 }
             }
         }
@@ -424,9 +424,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(
@@ -443,7 +443,7 @@ 
     public function logoutAction()
     {
         $auth = $this->auth;
-        $this->logger->info('User ' . ($auth->getUser()->login==''?$auth->getUser()->info->displayName:$auth->getUser()->login) . ' logged out');
+        $this->logger->info('User '.($auth->getUser()->login == '' ? $auth->getUser()->info->displayName : $auth->getUser()->login).' logged out');
         $auth->clearIdentity();
         unset($_SESSION['HA::STORE']);
 

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;
                 }

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

Indentation +6 added lines, -6 removed lines

@@ -49,9 +49,9 @@ 
         $paginator = $this->paginator('Auth/User', $params);
         $form = $this->getServiceLocator()->get('forms')
                 ->get('Core/TextSearch', [
-                                           'placeholder' => /*@translate*/ 'Type name, email address, role, or login name',
-                                           'button_element' => 'text'
-                                       ]);
+                                            'placeholder' => /*@translate*/ 'Type name, email address, role, or login name',
+                                            'button_element' => 'text'
+                                        ]);
 
         $return = array(
             'by' => $params['by'],
@@ -90,9 +90,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');

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/Form/UserStatusFieldset.php

Indentation +9 added lines, -9 removed lines

@@ -62,17 +62,17 @@
     }
 
     /**
-	 * @param array $statusOptions
-	 * @return UserStatusFieldset
-	 */
-	public function setStatusOptions(array $statusOptions)
-	{
-		$this->statusOptions = $statusOptions;
+     * @param array $statusOptions
+     * @return UserStatusFieldset
+     */
+    public function setStatusOptions(array $statusOptions)
+    {
+        $this->statusOptions = $statusOptions;
 		
-		return $this;
-	}
+        return $this;
+    }
 
-	public function init()
+    public function init()
     {
         $this->setName('status');
 

Spacing +1 added lines, -1 removed lines

@@ -121,7 +121,7 @@
                 'attributes' => [
                     'data-placeholder' => /*@translate*/ 'please select',
                     'data-allowclear' => 'false',
-                    'data-searchbox' => -1,  // hide the search box
+                    'data-searchbox' => -1, // hide the search box
                     'required' => true, // mark label as required
                 ],
             )

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/config/module.config.php

Spacing +22 added lines, -22 removed lines

@@ -29,7 +29,7 @@ 
                  * for multiple paths.
                  * example https://github.com/doctrine/DoctrineORMModule
                  */
-                'paths' => array( __DIR__ . '/../src/Auth/Entity'),
+                'paths' => array(__DIR__.'/../src/Auth/Entity'),
             ),
         ),
     ),
@@ -107,13 +107,13 @@ 
     'hybridauth' => array(
         "Facebook" => array(
             "enabled" => true,
-            "keys"    => array( "id" => "", "secret" => "" ),
+            "keys"    => array("id" => "", "secret" => ""),
             "scope"      => 'email, user_about_me, user_birthday, user_hometown, user_website',
             "display" => 'popup',
         ),
         "LinkedIn" => array(
             "enabled" => true,
-            "keys"    => array( "key" => "", "secret" => "" ),
+            "keys"    => array("key" => "", "secret" => ""),
         ),
         "XING" => array(
             "enabled" => true,
@@ -123,7 +123,7 @@ 
                 'class' => 'Hybrid_Providers_XING',
                 'path' => __FILE__,
             ),
-            "keys"    => array( "key" => "", "secret" => "" ),
+            "keys"    => array("key" => "", "secret" => ""),
         ),
         "Github" => array(
             "enabled" => true,
@@ -133,7 +133,7 @@ 
                 'class' => 'Hybrid_Providers_Github',
                 'path' => __FILE__,
             ),
-            "keys"    => array( "key" => "", "secret" => "" ),
+            "keys"    => array("key" => "", "secret" => ""),
         ),
 
     ),
@@ -233,7 +233,7 @@ 
         'translation_file_patterns' => array(
             array(
                 'type'     => 'gettext',
-                'base_dir' => __DIR__ . '/../language',
+                'base_dir' => __DIR__.'/../language',
                 'pattern'  => '%s.mo',
             ),
         ),
@@ -242,25 +242,25 @@ 
     // Configure the view service manager
     'view_manager' => array(
         'template_map' => array(
-            'form/auth/contact.form' => __DIR__ . '/../view/form/contact.form.phtml',
-            'form/auth/contact.view' => __DIR__ . '/../view/form/contact.view.phtml',
-            'form/auth/status.form' => __DIR__ . '/../view/form/status.form.phtml',
-            'form/auth/status.view' => __DIR__ . '/../view/form/status.view.phtml',
-            'auth/error/social-profiles-unconfigured' => __DIR__ . '/../view/error/social-profiles-unconfigured.phtml',
-            'auth/form/user-info-container' => __DIR__ . '/../view/form/user-info-container.phtml',
-            'auth/form/user-status-container' => __DIR__ . '/../view/form/user-status-container.phtml',
-            'auth/form/userselect' => __DIR__ . '/../view/form/userselect.phtml',
-            'auth/form/social-profiles-fieldset' => __DIR__ . '/../view/form/social-profiles-fieldset.phtml',
-            'auth/form/social-profiles-button' => __DIR__ . '/../view/form/social-profiles-button.phtml',
-            'auth/sidebar/groups-menu' => __DIR__ . '/../view/sidebar/groups-menu.phtml',
-            'mail/first-external-login' => __DIR__ . '/../view/mail/first-external-login.phtml',
-            'mail/first-socialmedia-login' => __DIR__ . '/../view/mail/first-socialmedia-login.phtml',
-            'mail/forgotPassword' =>  __DIR__ . '/../view/mail/forgot-password.phtml',
-            'mail/register' =>  __DIR__ . '/../view/mail/register.phtml',
+            'form/auth/contact.form' => __DIR__.'/../view/form/contact.form.phtml',
+            'form/auth/contact.view' => __DIR__.'/../view/form/contact.view.phtml',
+            'form/auth/status.form' => __DIR__.'/../view/form/status.form.phtml',
+            'form/auth/status.view' => __DIR__.'/../view/form/status.view.phtml',
+            'auth/error/social-profiles-unconfigured' => __DIR__.'/../view/error/social-profiles-unconfigured.phtml',
+            'auth/form/user-info-container' => __DIR__.'/../view/form/user-info-container.phtml',
+            'auth/form/user-status-container' => __DIR__.'/../view/form/user-status-container.phtml',
+            'auth/form/userselect' => __DIR__.'/../view/form/userselect.phtml',
+            'auth/form/social-profiles-fieldset' => __DIR__.'/../view/form/social-profiles-fieldset.phtml',
+            'auth/form/social-profiles-button' => __DIR__.'/../view/form/social-profiles-button.phtml',
+            'auth/sidebar/groups-menu' => __DIR__.'/../view/sidebar/groups-menu.phtml',
+            'mail/first-external-login' => __DIR__.'/../view/mail/first-external-login.phtml',
+            'mail/first-socialmedia-login' => __DIR__.'/../view/mail/first-socialmedia-login.phtml',
+            'mail/forgotPassword' =>  __DIR__.'/../view/mail/forgot-password.phtml',
+            'mail/register' =>  __DIR__.'/../view/mail/register.phtml',
         ),
     
         'template_path_stack' => array(
-            'Auth' => __DIR__ . '/../view',
+            'Auth' => __DIR__.'/../view',
         ),
     ),