cross-solution / YAWIK

module/Auth/src/Auth/Filter/StripQueryParams.php

Spacing +1 added lines, -1 removed lines

@@ -44,6 +44,6 @@
         
         parse_str($query, $queryParams);
         $queryParams = array_diff_key($queryParams, array_flip($stripParams));
-        return $uri . (empty($queryParams) ? '' : '?' . http_build_query($queryParams));
+        return $uri.(empty($queryParams) ? '' : '?'.http_build_query($queryParams));
     }
 }

module/Install/src/Listener/LanguageSetter.php

Spacing +3 added lines, -3 removed lines

@@ -79,13 +79,13 @@
 
         /* Set locale */
         $translator = $e->getApplication()->getServiceManager()->get('mvctranslator');
-        $locale     = $lang . '_' . strtoupper($lang);
+        $locale     = $lang.'_'.strtoupper($lang);
 
         setlocale(
             LC_ALL,
             array(
-                            $locale . ".utf8",
-                            $locale . ".iso88591",
+                            $locale.".utf8",
+                            $locale.".iso88591",
                             $locale,
                             substr($locale, 0, 2),
                             'de_DE.utf8',

module/Install/src/Controller/Plugin/YawikConfigCreator.php

Indentation +2 added lines, -2 removed lines

@@ -93,8 +93,8 @@
         // Create a file with the class/file map.
         // Stupid syntax highlighters make separating < from PHP declaration necessary
         $content = '<' . "?php\n"
-                   . "\n"
-                   . 'return ' . var_export($config, true) . ';';
+                    . "\n"
+                    . 'return ' . var_export($config, true) . ';';
 
         // Fix \' strings from injected DIRECTORY_SEPARATOR usage in iterator_apply op
         $content = str_replace("\\'", "'", $content);

Spacing +3 added lines, -3 removed lines

@@ -92,9 +92,9 @@ 
 
         // Create a file with the class/file map.
         // Stupid syntax highlighters make separating < from PHP declaration necessary
-        $content = '<' . "?php\n"
+        $content = '<'."?php\n"
                    . "\n"
-                   . 'return ' . var_export($config, true) . ';';
+                   . 'return '.var_export($config, true).';';
 
         // Fix \' strings from injected DIRECTORY_SEPARATOR usage in iterator_apply op
         $content = str_replace("\\'", "'", $content);
@@ -107,7 +107,7 @@ 
         $content = str_replace('array (', 'array(', $content);
 
         // Make the file end by EOL
-        $content = rtrim($content, "\n") . "\n";
+        $content = rtrim($content, "\n")."\n";
 
         var_export($config, true);
 

module/Auth/src/Auth/Adapter/HybridAuth.php

Indentation +9 added lines, -9 removed lines

@@ -211,14 +211,14 @@
     {
         return $this->repository;
     }
-	/**
-	 * @param SocialProfilePlugin
-	 * @return HybridAuth
-	 */
-	public function setSocialProfilePlugin(SocialProfilePlugin $socialProfilePlugin)
-	{
-		$this->socialProfilePlugin = $socialProfilePlugin;
+    /**
+     * @param SocialProfilePlugin
+     * @return HybridAuth
+     */
+    public function setSocialProfilePlugin(SocialProfilePlugin $socialProfilePlugin)
+    {
+        $this->socialProfilePlugin = $socialProfilePlugin;
 		
-		return $this;
-	}
+        return $this;
+    }
 }

module/Auth/src/Auth/Form/SocialProfiles.php

Spacing +1 added lines, -1 removed lines

@@ -67,7 +67,7 @@
 	 */
 	public function setUseDefaultValidation($bool)
 	{
-		$this->useDefaultValidation = (bool)$bool;
+		$this->useDefaultValidation = (bool) $bool;
 		
 		return $this;
 	}

Indentation +9 added lines, -9 removed lines

@@ -61,14 +61,14 @@
         return $this->useDefaultValidation ? \Laminas\Form\Form::isValid() : parent::isValid();
     }
     
-	/**
-	 * @param bool $bool
-	 * @return SocialProfiles
-	 */
-	public function setUseDefaultValidation($bool)
-	{
-		$this->useDefaultValidation = (bool)$bool;
+    /**
+     * @param bool $bool
+     * @return SocialProfiles
+     */
+    public function setUseDefaultValidation($bool)
+    {
+        $this->useDefaultValidation = (bool)$bool;
 		
-		return $this;
-	}
+        return $this;
+    }
 }

module/Auth/src/Auth/Controller/ManageController.php

Braces +1 added lines, -2 removed lines

@@ -96,8 +96,7 @@
                     'content' => $content,
                     )
                 );
-            }
-            elseif ($postProfiles) {
+            } elseif ($postProfiles) {
                 $formSocialProfiles->setData($this->params()->fromPost());
                 
                 if ($formSocialProfiles->isValid()) {

Indentation +52 added lines, -52 removed lines

@@ -28,66 +28,66 @@ 
  */
 class ManageController extends AbstractActionController
 {
-	private $userProfileContainer;
+    private $userProfileContainer;
 	
-	private $authService;
+    private $authService;
 	
-	private $socialProfileForm;
+    private $socialProfileForm;
 	
-	private $translator;
+    private $translator;
 	
-	private $repositories;
+    private $repositories;
 	
-	private $viewHelper;
+    private $viewHelper;
 	
-	private $hybridAuthAdapter;
+    private $hybridAuthAdapter;
 	
-	/**
-	 * @param ContainerInterface $container
-	 * @return ManageController
-	 */
-	static public function factory(ContainerInterface $container)
-	{
-		$forms = $container->get('forms');
-		$userProfileContainer = $forms->get('Auth/UserProfileContainer');
-		$socialProfileForm = $forms->get('Auth/SocialProfiles');
-		$authService = $container->get('AuthenticationService');
-		$translator = $container->get('translator');
-		$repositories = $container->get('repositories');
-		$viewHelper = $container->get('ViewHelperManager');
-		$hybridAuthAdapter = $container->get('HybridAuthAdapter');
-		$controller = new ManageController(
-			$userProfileContainer,
-			$authService,
-			$repositories,
-			$socialProfileForm,
-			$translator,
-			$viewHelper,
-			$hybridAuthAdapter
-		);
-		return $controller;
-	}
+    /**
+     * @param ContainerInterface $container
+     * @return ManageController
+     */
+    static public function factory(ContainerInterface $container)
+    {
+        $forms = $container->get('forms');
+        $userProfileContainer = $forms->get('Auth/UserProfileContainer');
+        $socialProfileForm = $forms->get('Auth/SocialProfiles');
+        $authService = $container->get('AuthenticationService');
+        $translator = $container->get('translator');
+        $repositories = $container->get('repositories');
+        $viewHelper = $container->get('ViewHelperManager');
+        $hybridAuthAdapter = $container->get('HybridAuthAdapter');
+        $controller = new ManageController(
+            $userProfileContainer,
+            $authService,
+            $repositories,
+            $socialProfileForm,
+            $translator,
+            $viewHelper,
+            $hybridAuthAdapter
+        );
+        return $controller;
+    }
 	
-	public function __construct(
-		UserProfileContainer $userProfileContainer,
-		AuthenticationService $authService,
-		RepositoryService $repositories,
-		SocialProfiles $socialProfileForm,
-		Translator $translator,
-		HelperPluginManager $viewHelper,
-		HybridAuth $hybridAuthAdapter
-	)
-	{
-		$this->userProfileContainer = $userProfileContainer;
-		$this->authService = $authService;
-		$this->socialProfileForm = $socialProfileForm;
-		$this->repositories = $repositories;
-		$this->translator = $translator;
-		$this->viewHelper = $viewHelper;
-		$this->hybridAuthAdapter = $hybridAuthAdapter;
-	}
+    public function __construct(
+        UserProfileContainer $userProfileContainer,
+        AuthenticationService $authService,
+        RepositoryService $repositories,
+        SocialProfiles $socialProfileForm,
+        Translator $translator,
+        HelperPluginManager $viewHelper,
+        HybridAuth $hybridAuthAdapter
+    )
+    {
+        $this->userProfileContainer = $userProfileContainer;
+        $this->authService = $authService;
+        $this->socialProfileForm = $socialProfileForm;
+        $this->repositories = $repositories;
+        $this->translator = $translator;
+        $this->viewHelper = $viewHelper;
+        $this->hybridAuthAdapter = $hybridAuthAdapter;
+    }
 	
-	/**
+    /**
      * @return array|JsonModel
      */
     public function profileAction()
@@ -121,7 +121,7 @@ 
                 $postData  = $form->getOption('use_post_array') ? $_POST : array();
                 //@TODO: [ZF3] option use_files_array is false by default
                 //$filesData = $form->getOption('use_files_array') ? $_FILES : array();
-	            $filesData = $_FILES;
+                $filesData = $_FILES;
                 $data      = array_merge($postData, $filesData);
                 $form->setData($data);
                 

Spacing +6 added lines, -6 removed lines

@@ -95,11 +95,11 @@ 
         /* @var \Auth\Form\UserProfileContainer $userProfileContainer */
         $userProfileContainer = $this->userProfileContainer;
         $user = $this->authService->getUser(); /* @var $user \Auth\Entity\User */
-        $postProfiles = (array)$this->params()->fromPost('social_profiles');
+        $postProfiles = (array) $this->params()->fromPost('social_profiles');
         $userProfiles = $user->getProfile();
         $formSocialProfiles = $this->socialProfileForm
             ->setUseDefaultValidation(true)
-            ->setData(['social_profiles' => array_map(function ($array)
+            ->setData(['social_profiles' => array_map(function($array)
             {
                 return $array['data'];
             }, $userProfiles)]);
@@ -118,11 +118,11 @@ 
             $form      = $userProfileContainer->getForm($formName);
             
             if ($form) {
-                $postData  = $form->getOption('use_post_array') ? $_POST : array();
+                $postData = $form->getOption('use_post_array') ? $_POST : array();
                 //@TODO: [ZF3] option use_files_array is false by default
                 //$filesData = $form->getOption('use_files_array') ? $_FILES : array();
 	            $filesData = $_FILES;
-                $data      = array_merge($postData, $filesData);
+                $data = array_merge($postData, $filesData);
                 $form->setData($data);
                 
                 if (!$form->isValid()) {
@@ -183,7 +183,7 @@ 
                                 ));
                             } else {
                                 $profile = [
-                                    'auth' => (array)$authProfile,
+                                    'auth' => (array) $authProfile,
                                     'data' => \Laminas\Json\Json::decode($dataProfiles[$network])
                                 ];
                                 $user->addProfile($network, $profile);
@@ -193,7 +193,7 @@ 
                 }
                 
                 // keep data in sync & properly decoded
-                $formSocialProfiles->setData(['social_profiles' => array_map(function ($array)
+                $formSocialProfiles->setData(['social_profiles' => array_map(function($array)
                 {
                     return \Laminas\Json\Json::decode($array) ?: '';
                 }, $dataProfiles)]);

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

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 \Laminas\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 (\Laminas\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();
     }