cross-solution / YAWIK

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

Spacing +32 added lines, -32 removed lines

@@ -34,8 +34,8 @@ 
 class IndexController extends AbstractActionController
 {
 
-    const LOGIN='login';
-    const REGISTER='register';
+    const LOGIN = 'login';
+    const REGISTER = 'register';
 
     /**
      * @var AuthenticationService
@@ -91,7 +91,7 @@ 
         $registerForm = $this->forms[self::REGISTER];
 
         /* @var $request \Zend\Http\Request */
-        $request   = $this->getRequest();
+        $request = $this->getRequest();
 
         if ($request->isPost()) {
             $data                          = $this->params()->fromPost();
@@ -109,7 +109,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']);
             }
             
@@ -120,14 +120,14 @@ 
             if ($result->isValid()) {
                 $user = $auth->getUser();
                 $language = $services->get('Core/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 = $services->get('ViewHelperManager')->get('url');
                     $url = $urlHelper('lang', array('lang' => $language));
@@ -137,9 +137,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.');
             }
         }
@@ -198,9 +198,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);
@@ -219,11 +219,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);
@@ -234,11 +234,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);
     }
@@ -270,8 +270,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
@@ -302,7 +302,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];
@@ -326,7 +326,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);
@@ -341,8 +341,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);
@@ -367,8 +367,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',
                 )
@@ -377,7 +377,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
@@ -398,16 +398,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;
                 }
             }
         }
@@ -417,9 +417,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(
@@ -436,7 +436,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/Controller/Plugin/SocialProfiles.php

Doc Comments +3 added lines

@@ -69,6 +69,9 @@
         return $this;
     }
     
+    /**
+     * @param string $network
+     */
     public function getAdapter($network)
     {
         if (isset($this->adapters[$network])) {

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

Doc Comments -1 removed lines

@@ -29,7 +29,6 @@
     {}
     
     /**
-     * @param string $network
      * @return \Auth\Entity\SocialProfiles\ProfileInterface|bool
      */
     public function fetch($api)

Spacing +2 added lines, -2 removed lines

@@ -34,7 +34,7 @@ 
      */
     public function fetch($api)
     {
-        $result  = $this->queryApi($api);
+        $result = $this->queryApi($api);
         if (!$result) {
             return false;
         }
@@ -60,7 +60,7 @@ 
         $class = get_class($this);
         $class = explode('\\', $class);
         $class = array_pop($class);
-        $class = '\\Auth\\Entity\\SocialProfiles\\' . $class;
+        $class = '\\Auth\\Entity\\SocialProfiles\\'.$class;
         
         return $class;
     }

module/Cv/src/Cv/Form/SearchForm.php

Indentation +34 added lines, -34 removed lines

@@ -34,44 +34,44 @@
     {
 
         $this->add(
-             [
-                 'name' => 'l',
-                 'type' => 'LocationSelect',
-                 'options' => [
-                     'label' => /*@translate*/ 'Location',
-                     'span' => 3,
-                     'location_entity' => Location::class,
-                 ],
-                 'attributes' => [
-                     'data-width' => '100%',
-                 ],
-             ]
+                [
+                    'name' => 'l',
+                    'type' => 'LocationSelect',
+                    'options' => [
+                        'label' => /*@translate*/ 'Location',
+                        'span' => 3,
+                        'location_entity' => Location::class,
+                    ],
+                    'attributes' => [
+                        'data-width' => '100%',
+                    ],
+                ]
         );
 
         $this->add(
-             [
-                 'name' => 'd',
-                 'type' => 'Zend\Form\Element\Select',
-                 'options' => [
-                     'label' => /*@translate*/ 'Distance',
-                     'value_options' => [
-                         '5' => '5 km',
-                         '10' => '10 km',
-                         '20' => '20 km',
-                         '50' => '50 km',
-                         '100' => '100 km'
-                     ],
-                     'span' => 4,
+                [
+                    'name' => 'd',
+                    'type' => 'Zend\Form\Element\Select',
+                    'options' => [
+                        'label' => /*@translate*/ 'Distance',
+                        'value_options' => [
+                            '5' => '5 km',
+                            '10' => '10 km',
+                            '20' => '20 km',
+                            '50' => '50 km',
+                            '100' => '100 km'
+                        ],
+                        'span' => 4,
 
-                 ],
-                 'attributes' => [
-                     'value' => '10', // default distance
-                     'data-searchbox' => -1,  // hide the search box
-                     'data-allowclear' => 'false', // allow to clear a selected value
-                     'data-placeholder' => /*@translate*/ 'Distance',
-                     'data-width' => '100%',
-                 ]
-             ]
+                    ],
+                    'attributes' => [
+                        'value' => '10', // default distance
+                        'data-searchbox' => -1,  // hide the search box
+                        'data-allowclear' => 'false', // allow to clear a selected value
+                        'data-placeholder' => /*@translate*/ 'Distance',
+                        'data-width' => '100%',
+                    ]
+                ]
         );
     }
 }
\ No newline at end of file

Spacing +1 added lines, -1 removed lines

@@ -66,7 +66,7 @@
                  ],
                  'attributes' => [
                      'value' => '10', // default distance
-                     'data-searchbox' => -1,  // hide the search box
+                     'data-searchbox' => -1, // hide the search box
                      'data-allowclear' => 'false', // allow to clear a selected value
                      'data-placeholder' => /*@translate*/ 'Distance',
                      'data-width' => '100%',

module/Cv/config/module.config.php

Spacing +8 added lines, -8 removed lines

@@ -15,7 +15,7 @@ 
                  * for multiple paths.
                  * example https://github.com/doctrine/DoctrineORMModule
                  */
-                'paths' => [ __DIR__ . '/../src/Cv/Entity'],
+                'paths' => [__DIR__.'/../src/Cv/Entity'],
             ],
         ],
         'eventmanager' => [
@@ -36,7 +36,7 @@ 
         'translation_file_patterns' => [
             [
                 'type'     => 'gettext',
-                'base_dir' => __DIR__ . '/../language',
+                'base_dir' => __DIR__.'/../language',
                 'pattern'  => '%s.mo',
             ],
         ],
@@ -164,7 +164,7 @@ 
             'resume-recruiter' => [
                 'label' =>  /*@translate*/ 'Talent-Pool',
                 'route' => 'lang/cvs',
-                'active_on' => [ 'lang/cvs/edit', 'lang/cvs/view' ],
+                'active_on' => ['lang/cvs/edit', 'lang/cvs/view'],
                 'resource' => 'navigation/resume-recruiter',
                 'order' => 10,
                 'query' => [
@@ -195,15 +195,15 @@ 
     
         // Map template to files. Speeds up the lookup through the template stack.
         'template_map' => [
-            'cv/form/employment.view' => __DIR__ . '/../view/cv/form/employment.view.phtml',
-            'cv/form/employment.form' => __DIR__ . '/../view/cv/form/employment.form.phtml',
-            'cv/form/education.view' => __DIR__ . '/../view/cv/form/education.view.phtml',
-            'cv/form/education.form' => __DIR__ . '/../view/cv/form/education.form.phtml'
+            'cv/form/employment.view' => __DIR__.'/../view/cv/form/employment.view.phtml',
+            'cv/form/employment.form' => __DIR__.'/../view/cv/form/employment.form.phtml',
+            'cv/form/education.view' => __DIR__.'/../view/cv/form/education.view.phtml',
+            'cv/form/education.form' => __DIR__.'/../view/cv/form/education.form.phtml'
         ],
     
         // Where to look for view templates not mapped above
         'template_path_stack' => [
-            __DIR__ . '/../view',
+            __DIR__.'/../view',
         ],
     ],
 

module/Auth/src/Auth/Listener/MailForgotPassword.php

Spacing +5 added lines, -5 removed lines

@@ -39,8 +39,8 @@ 
 
     public function __construct($options, $mailService, $coreOptions)
     {
-        $this->options=$options;
-        $this->mailService=$mailService;
+        $this->options = $options;
+        $this->mailService = $mailService;
         $this->coreOptions = $coreOptions;
     }
 
@@ -51,15 +51,15 @@ 
      */
     public function __invoke(AuthEvent $e)
     {
-        $siteName=$this->coreOptions->getSiteName();
+        $siteName = $this->coreOptions->getSiteName();
         /* @var \Auth\Entity\User $user */
         $user                    = $e->getUser();
         $userEmail               = $user->getInfo()->getEmail();
         $userName                = $user->getInfo()->getDisplayName(false);
         $resetLink               = $e->getResetLink();
 
-        $fromEmail               =  $this->options->getFromEmail();
-        $fromName                =  $this->options->getFromName();
+        $fromEmail               = $this->options->getFromEmail();
+        $fromName                = $this->options->getFromName();
 
 
         $mail                    = $this->mailService->get('htmltemplate');

module/Auth/config/module.config.php

Spacing +23 added lines, -23 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'),
             ),
         ),
     ),
@@ -108,13 +108,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,
@@ -124,7 +124,7 @@ 
                 'class' => 'Hybrid_Providers_XING',
                 'path' => __FILE__,
             ),
-            "keys"    => array( "key" => "", "secret" => "" ),
+            "keys"    => array("key" => "", "secret" => ""),
         ),
         "Github" => array(
             "enabled" => true,
@@ -134,7 +134,7 @@ 
                 'class' => 'Hybrid_Providers_Github',
                 'path' => __FILE__,
             ),
-            "keys"    => array( "key" => "", "secret" => "" ),
+            "keys"    => array("key" => "", "secret" => ""),
         ),
 
     ),
@@ -237,7 +237,7 @@ 
         'translation_file_patterns' => array(
             array(
                 'type'     => 'gettext',
-                'base_dir' => __DIR__ . '/../language',
+                'base_dir' => __DIR__.'/../language',
                 'pattern'  => '%s.mo',
             ),
         ),
@@ -246,26 +246,26 @@ 
     // 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/forgotPassword.en' =>  __DIR__ . '/../view/mail/forgot-password.en.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/forgotPassword.en' =>  __DIR__.'/../view/mail/forgot-password.en.phtml',
+            'mail/register' =>  __DIR__.'/../view/mail/register.phtml',
         ),
     
         'template_path_stack' => array(
-            'Auth' => __DIR__ . '/../view',
+            'Auth' => __DIR__.'/../view',
         ),
     ),