cross-solution / YAWIK

module/Core/src/Core/Listener/LanguageRouteListener.php

Doc Comments +2 added lines, -2 removed lines

@@ -215,8 +215,8 @@
     }
 
     /**
-     * @param $response
-     * @param $uri
+     * @param \Zend\Stdlib\ResponseInterface $response
+     * @param string $uri
      *
      * @return mixed
      */

Spacing +4 added lines, -4 removed lines

@@ -97,10 +97,10 @@ 
         }
         
         $router = $e->getRouter();
-        $basePath=$router->getBaseUrl();
+        $basePath = $router->getBaseUrl();
         $match = [];
         
-        if (preg_match('~^' . $basePath . '/([a-z]{2})(?:/|$)~', $e->getRequest()->getRequestUri(), $match)) {
+        if (preg_match('~^'.$basePath.'/([a-z]{2})(?:/|$)~', $e->getRequest()->getRequestUri(), $match)) {
             /* It seems we have already a language in the URI
              * Now there are two possibilities:
              *
@@ -182,8 +182,8 @@ 
         setlocale(
             LC_ALL,
             array(
-            $locale . ".utf8",
-            $locale . ".iso88591",
+            $locale.".utf8",
+            $locale.".iso88591",
             $locale,
             substr($locale, 0, 2),
             'de_DE.utf8',

module/Core/src/Core/I18n/Locale.php

Indentation +6 added lines, -6 removed lines

@@ -108,10 +108,10 @@
     }
     
     /**
-	 * @return string
-	 */
-	public function getDefaultLanguage()
-	{
-		return $this->defaultLanguage;
-	}
+     * @return string
+     */
+    public function getDefaultLanguage()
+    {
+        return $this->defaultLanguage;
+    }
 }

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

Spacing +34 added lines, -34 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']);
             }
             
@@ -117,14 +117,14 @@ 
             if ($result->isValid()) {
                 $user = $auth->getUser();
                 $language = $services->get('Core/Locale')->detectLanguage($request, $user);
-                $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));
@@ -134,9 +134,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.');
             }
         }
@@ -195,11 +195,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());
 
@@ -216,11 +216,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);
@@ -231,11 +231,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);
     }
@@ -267,8 +267,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
@@ -299,7 +299,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];
@@ -323,7 +323,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);
@@ -338,8 +338,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);
@@ -364,8 +364,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',
                 )
@@ -374,7 +374,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
@@ -395,16 +395,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;
                 }
             }
         }
@@ -414,9 +414,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(
@@ -433,7 +433,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']);