cross-solution / YAWIK

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)]);

module/Auth/src/Auth/Form/Validator/UniqueGroupNameFactory.php

Spacing +1 added lines, -1 removed lines

@@ -37,7 +37,7 @@
         $this->options['allowName'] = isset($options['allowName']) ? $options['allowName'] : null;
     }
 	
-	public function __invoke( ContainerInterface $container, $requestedName, array $options = null )
+	public function __invoke(ContainerInterface $container, $requestedName, array $options = null)
 	{
 		$auth      = $container->get('AuthenticationService');
 		$user      = $auth->getUser();

module/Organizations/config/module.config.php

Spacing +17 added lines, -17 removed lines

@@ -13,7 +13,7 @@ 
                 ],
             ],
             'annotation' => [
-                'paths' => [ __DIR__ . '/../src/Organizations/Entity']
+                'paths' => [__DIR__.'/../src/Organizations/Entity']
             ],
         ],
         'eventmanager' => [
@@ -40,7 +40,7 @@ 
         'translation_file_patterns' => [
             [
                 'type' => 'gettext',
-                'base_dir' => __DIR__ . '/../language',
+                'base_dir' => __DIR__.'/../language',
                 'pattern' => '%s.mo',
             ],
         ],
@@ -49,7 +49,7 @@ 
 
     'controllers' => [
         'factories' => [
-	        'Organizations/InviteEmployee' => [\Organizations\Controller\InviteEmployeeController::class,'factory'],
+	        'Organizations/InviteEmployee' => [\Organizations\Controller\InviteEmployeeController::class, 'factory'],
             'Organizations/Index' => 'Organizations\Factory\Controller\IndexControllerFactory',
         ]
     ],
@@ -65,18 +65,18 @@ 
     'view_manager' => [
         // Map template to files. Speeds up the lookup through the template stack.
         'template_map' => [
-             'organizations/index/edit' => __DIR__ . '/../view/organizations/index/form.phtml',
-             'organizations/form/employees-fieldset' => __DIR__ . '/../view/form/employees-fieldset.phtml',
-             'organizations/form/employee-fieldset' => __DIR__ .'/../view/form/employee-fieldset.phtml',
-             'organizations/form/invite-employee-bar' => __DIR__ . '/../view/form/invite-employee-bar.phtml',
-             'organizations/error/no-parent' => __DIR__ . '/../view/error/no-parent.phtml',
-             'organizations/error/invite' => __DIR__ . '/../view/error/invite.phtml',
-             'organizations/mail/invite-employee' => __DIR__ . '/../view/mail/invite-employee.phtml',
-             'organizations/form/workflow-fieldset' => __DIR__ . '/../view/form/workflow-fieldset.phtml',
+             'organizations/index/edit' => __DIR__.'/../view/organizations/index/form.phtml',
+             'organizations/form/employees-fieldset' => __DIR__.'/../view/form/employees-fieldset.phtml',
+             'organizations/form/employee-fieldset' => __DIR__.'/../view/form/employee-fieldset.phtml',
+             'organizations/form/invite-employee-bar' => __DIR__.'/../view/form/invite-employee-bar.phtml',
+             'organizations/error/no-parent' => __DIR__.'/../view/error/no-parent.phtml',
+             'organizations/error/invite' => __DIR__.'/../view/error/invite.phtml',
+             'organizations/mail/invite-employee' => __DIR__.'/../view/mail/invite-employee.phtml',
+             'organizations/form/workflow-fieldset' => __DIR__.'/../view/form/workflow-fieldset.phtml',
         ],
         // Where to look for view templates not mapped above
         'template_path_stack' => [
-            __DIR__ . '/../view',
+            __DIR__.'/../view',
         ],
     ],
     'form_elements' => [
@@ -146,11 +146,11 @@ 
                 'allow' => [
                     'Entity/OrganizationImage',
                     'route/lang/organizations/invite',
-                    'Organizations/InviteEmployee' => [ 'accept' ],
+                    'Organizations/InviteEmployee' => ['accept'],
                 ],
                 'deny' => [
                     'route/lang/organizations',
-                    'Organizations/InviteEmployee' => [ 'invite' ],
+                    'Organizations/InviteEmployee' => ['invite'],
                 ],
             ],
             // recruiters are allowed to view their companies
@@ -158,7 +158,7 @@ 
                 'allow' => [
                     'route/lang/organizations',
                     'Organizations/InviteEmployee',
-                    'Entity/Organization' => [ 'edit' => 'Organizations/Write' ],
+                    'Entity/Organization' => ['edit' => 'Organizations/Write'],
                 ],
             ],
         ],
@@ -174,8 +174,8 @@ 
             'organizations' => [
                 'label' => 'Organizations',
                 'route' => 'lang/organizations',
-                'order' => 65,                             // allows to order the menu items
-                'resource' => 'route/lang/organizations',  // if a resource is defined, the acl will be applied.
+                'order' => 65, // allows to order the menu items
+                'resource' => 'route/lang/organizations', // if a resource is defined, the acl will be applied.
 
                 'pages' => [
                     'list' => [

module/Organizations/src/Organizations/Entity/Hydrator/OrganizationHydratorFactory.php

Spacing +1 added lines, -1 removed lines

@@ -17,7 +17,7 @@
 
 class OrganizationHydratorFactory implements FactoryInterface
 {
-	public function __invoke( ContainerInterface $container, $requestedName, array $options = null ) {
+	public function __invoke(ContainerInterface $container, $requestedName, array $options = null) {
 		$repositoryManager = $container->get('repositories');
 		$repOrganization = $repositoryManager->get('Organizations/Organization');
 		$repOrganizationName = $repositoryManager->get('Organizations/OrganizationName');

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

Spacing +1 added lines, -1 removed lines

@@ -33,6 +33,6 @@
         $viewHelper = $container->get('ViewHelperManager');
         $translator = $container->get('translator');
 
-        return new IndexController($form, $organizationRepository,$translator,$formManager,$viewHelper);
+        return new IndexController($form, $organizationRepository, $translator, $formManager, $viewHelper);
     }
 }

module/Organizations/src/Organizations/Factory/Form/OrganizationsNameFieldsetFactory.php

Spacing +2 added lines, -2 removed lines

@@ -30,9 +30,9 @@
 	 * @inheritdoc
 	 * @return OrganizationsNameFieldset
 	 */
-	public function __invoke( ContainerInterface $container, $requestedName, array $options = null )
+	public function __invoke(ContainerInterface $container, $requestedName, array $options = null)
 	{
-		$fieldset = new OrganizationsNameFieldset($requestedName,$options);
+		$fieldset = new OrganizationsNameFieldset($requestedName, $options);
 		
 		$fieldset->setRepositories($container->get('repositories'));
 		return $fieldset;