cross-solution / YAWIK

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

Doc Comments +1 added lines, -1 removed lines

@@ -54,7 +54,7 @@
      * @param $auth  AuthenticationService
      * @param $logger LoggerInterface
      * @param $forms
-     * @param $options ModuleOptions
+     * @param ModuleOptions $options ModuleOptions
      */
     public function __construct(AuthenticationService $auth, LoggerInterface $logger,array $forms, $options)
     {

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/Options/CaptchaOptions.php

Doc Comments +1 added lines, -1 removed lines

@@ -70,7 +70,7 @@
     }
 
     /**
-     * @return bool
+     * @return string
      */
     public function getMode()
     {

Spacing +3 added lines, -3 removed lines

@@ -40,9 +40,9 @@
      * @var array
      */
     protected $reCaptcha = [
-        'public_key' => 'Your Recapture Public Key',      // "site_key"
-        'private_key' => 'Your Recapture Private Key',    // "secret_key"
-        'ssl' => true,                                    // include google api via http(s)
+        'public_key' => 'Your Recapture Public Key', // "site_key"
+        'private_key' => 'Your Recapture Private Key', // "secret_key"
+        'ssl' => true, // include google api via http(s)
         ];
 
     /**

module/Jobs/src/Jobs/Controller/ApiJobListByOrganizationController.php

Spacing +1 added lines, -1 removed lines

@@ -41,7 +41,7 @@
             $response->setStatusCode(Response::STATUS_CODE_404);
             return $response;
         }
-        $jsonModel=new JsonModel();
+        $jsonModel = new JsonModel();
         $jsonModel->setVariables($this->apiJobDehydrator->dehydrateList($jobs));
         $jsonModel->setJsonpCallback('yawikParseJobs');
 

module/Jobs/src/Jobs/Form/TemplateLabelBenefits.php

Indentation +1 added lines, -1 removed lines

@@ -62,6 +62,6 @@
                     )
                 )
             )
-       );
+        );
     }
 }

module/Jobs/src/Jobs/Form/ListFilterLocationFieldset.php

Spacing +1 added lines, -1 removed lines

@@ -55,7 +55,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',
                 ]

module/Auth/src/Auth/Form/UserInfoFieldset.php

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/Jobs/src/Jobs/Form/ListFilterAdminFieldset.php

Spacing +1 added lines, -1 removed lines

@@ -55,7 +55,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',
                 ]

module/Install/Module.php

Indentation +1 added lines, -1 removed lines

@@ -60,6 +60,6 @@
         $services     = $application->getServiceManager();
 
         $services->get('Install/Listener/LanguageSetter')
-                 ->attach($eventManager);
+                    ->attach($eventManager);
     }
 }

Spacing +5 added lines, -5 removed lines

@@ -24,23 +24,23 @@
 
     public function getConfig()
     {
-        return include __DIR__ . '/config/module.config.php';
+        return include __DIR__.'/config/module.config.php';
     }
 
     public function getAutoloaderConfig()
     {
         return array(
             'Zend\Loader\ClassMapAutoloader' => array(
-                __DIR__ . '/autoload_classmap.php',
+                __DIR__.'/autoload_classmap.php',
                 array(
                     // We need this filter for initial user creation.
-                    'Auth\Entity\Filter\CredentialFilter' => __DIR__ . '/../Auth/src/Auth/Entity/Filter/CredentialFilter.php',
+                    'Auth\Entity\Filter\CredentialFilter' => __DIR__.'/../Auth/src/Auth/Entity/Filter/CredentialFilter.php',
                 ),
             ),
             'Zend\Loader\StandardAutoloader' => array(
                 'namespaces' => array(
-                    __NAMESPACE__ => __DIR__ . '/src' /* . __NAMESPACE__*/,
-                    __NAMESPACE__ . 'Test' => __DIR__ . '/test/' . __NAMESPACE__ . 'Test',
+                    __NAMESPACE__ => __DIR__.'/src' /* . __NAMESPACE__*/,
+                    __NAMESPACE__.'Test' => __DIR__.'/test/'.__NAMESPACE__.'Test',
                 ),
             ),
         );

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

Doc Comments +2 added lines, -2 removed lines

@@ -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->type, 'image/')) {
                 throw new UnauthorizedImageAccessException(str_replace('resource', 'image', $msg));