cross-solution / YAWIK

module/Auth/src/Auth/Factory/Adapter/ExternalApplicationAdapterFactory.php

Spacing +1 added lines, -1 removed lines

@@ -23,7 +23,7 @@
 class ExternalApplicationAdapterFactory implements FactoryInterface
 {
 	
-	public function __invoke( ContainerInterface $container, $requestedName, array $options = null )
+	public function __invoke(ContainerInterface $container, $requestedName, array $options = null)
 	{
 		$repository = $container->get('repositories')->get('Auth/User');
 		$adapter = new ExternalApplication($repository);

module/Auth/src/Auth/Factory/Controller/IndexControllerFactory.php

Spacing +1 added lines, -1 removed lines

@@ -61,7 +61,7 @@
         $hybridAuthAdapter = $container->get('HybridAuthAdapter');
 		$externalAdapter = $container->get('ExternalApplicationAdapter');
 		$repositories = $container->get('repositories');
-        $controller = new IndexController($auth, $logger, $userLoginAdapter,$locale,$viewHelperManager,$forms, $options,$hybridAuthAdapter,$externalAdapter,$repositories);
+        $controller = new IndexController($auth, $logger, $userLoginAdapter, $locale, $viewHelperManager, $forms, $options, $hybridAuthAdapter, $externalAdapter, $repositories);
         return $controller;
     }
     /**

module/Auth/src/Auth/Factory/Controller/UsersControllerFactory.php

Spacing +1 added lines, -1 removed lines

@@ -32,6 +32,6 @@
         $users = $container->get('repositories')->get('Auth/User');
 		$formManager = $container->get('forms');
 		$viewHelper = $container->get('ViewHelperManager');
-        return new UsersController($users,$formManager,$viewHelper);
+        return new UsersController($users, $formManager, $viewHelper);
     }
 }

module/Auth/src/Auth/Controller/ManageGroupsController.php

Spacing +3 added lines, -3 removed lines

@@ -75,7 +75,7 @@ 
          */
         $events->attach(
             MvcEvent::EVENT_DISPATCH,
-            function ($event) {
+            function($event) {
                 $routeMatch = $event->getRouteMatch();
                 $action     = $routeMatch->getParam('action');
             
@@ -95,7 +95,7 @@ 
          */
         $events->attach(
             MvcEvent::EVENT_DISPATCH,
-            function ($event) {
+            function($event) {
                 $model = $event->getResult();
                 if (!$model instanceof ViewModel || $model->terminate()) {
                     return;
@@ -223,7 +223,7 @@ 
             $users = $repository->findByQuery($query);
         
             $userFilter = $this->filterManager->get('Auth/Entity/UserToSearchResult');
-            $filterFunc = function ($user) use ($userFilter) {
+            $filterFunc = function($user) use ($userFilter) {
                 return $userFilter->filter($user);
             };
             $result     = array_values(array_map($filterFunc, $users->toArray()));

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

Spacing +2 added lines, -2 removed lines

@@ -30,7 +30,7 @@ 
 	 */
     protected $request;
     
-    public function __construct($hybridAuth,RequestInterface $request,array $adapters = array())
+    public function __construct($hybridAuth, RequestInterface $request, array $adapters = array())
     {
         $this->hybridAuth = $hybridAuth;
         $this->request = $request;
@@ -70,7 +70,7 @@ 
             throw new \InvalidArgumentException(
                 sprintf(
                     'Adapter must be either a string or an instance of \Auth\Controller\Plugin\SocialProfiles\AbstractAdapter, but received %s',
-                    is_object($adapter) ? get_class($adapter) : '(' . gettype($adapter) . ')'
+                    is_object($adapter) ? get_class($adapter) : '('.gettype($adapter).')'
                 )
             );
         }

module/Auth/src/Auth/Controller/Plugin/Service/SocialProfilesFactory.php

Spacing +2 added lines, -2 removed lines

@@ -16,11 +16,11 @@
 
 class SocialProfilesFactory implements FactoryInterface
 {
-	public function __invoke( ContainerInterface $container, $requestedName, array $options = null )
+	public function __invoke(ContainerInterface $container, $requestedName, array $options = null)
 	{
 		$request = $container->get('request');
 		$hybridAuth = $container->get('HybridAuth');
-		$plugin     = new SocialProfiles($hybridAuth,$request);
+		$plugin     = new SocialProfiles($hybridAuth, $request);
 		
 		return $plugin;
 	}

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

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 \Zend\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 (\Zend\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/Controller/UsersController.php

Spacing +2 added lines, -2 removed lines

@@ -40,7 +40,7 @@ 
     /**
      * @param UserRepository $userRepository
      */
-    public function __construct(UserRepository $userRepository,$formManager,$viewHelper)
+    public function __construct(UserRepository $userRepository, $formManager, $viewHelper)
     {
         $this->userRepository = $userRepository;
         $this->formManager = $formManager;
@@ -186,7 +186,7 @@ 
         }
 
         $switcher = $this->plugin('Auth/User/Switcher');
-        $success  = $switcher($this->params()->fromQuery('id'), [ 'ref' => urldecode($this->params()->fromQuery('ref')) ]);
+        $success  = $switcher($this->params()->fromQuery('id'), ['ref' => urldecode($this->params()->fromQuery('ref'))]);
 
         return new JsonModel(['success' => true]);
     }

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

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' => \Zend\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 \Zend\Json\Json::decode($array) ?: '';
                 }, $dataProfiles)]);