Completed
Pull Request — develop (#434)
by Carsten
06:27
created
module/Auth/src/Auth/Controller/ManageGroupsController.php 2 patches
Indentation   +14 added lines, -14 removed lines patch added patch discarded remove patch
@@ -36,24 +36,24 @@
 block discarded – undo
36 36
     private $filterManager;
37 37
     
38 38
     public function __construct(
39
-    	$formManager,
40
-		$repositories,
41
-		$filterManager
39
+        $formManager,
40
+        $repositories,
41
+        $filterManager
42 42
     )
43 43
     {
44
-    	$this->formManager = $formManager;
45
-    	$this->repositories = $repositories;
46
-    	$this->filterManager = $filterManager;
44
+        $this->formManager = $formManager;
45
+        $this->repositories = $repositories;
46
+        $this->filterManager = $filterManager;
47 47
     }
48 48
 	
49
-	static public function factory(ContainerInterface $container)
50
-	{
51
-		return new self(
52
-			$container->get('FormElementManager'),
53
-			$container->get('repositories'),
54
-			$container->get('FilterManager')
55
-		);
56
-	}
49
+    static public function factory(ContainerInterface $container)
50
+    {
51
+        return new self(
52
+            $container->get('FormElementManager'),
53
+            $container->get('repositories'),
54
+            $container->get('FilterManager')
55
+        );
56
+    }
57 57
     
58 58
     /**
59 59
      * Register the default events for this controller
Please login to merge, or discard this patch.
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -75,7 +75,7 @@  discard block
 block discarded – undo
75 75
          */
76 76
         $events->attach(
77 77
             MvcEvent::EVENT_DISPATCH,
78
-            function ($event) {
78
+            function($event) {
79 79
                 $routeMatch = $event->getRouteMatch();
80 80
                 $action     = $routeMatch->getParam('action');
81 81
             
@@ -95,7 +95,7 @@  discard block
 block discarded – undo
95 95
          */
96 96
         $events->attach(
97 97
             MvcEvent::EVENT_DISPATCH,
98
-            function ($event) {
98
+            function($event) {
99 99
                 $model = $event->getResult();
100 100
                 if (!$model instanceof ViewModel || $model->terminate()) {
101 101
                     return;
@@ -223,7 +223,7 @@  discard block
 block discarded – undo
223 223
             $users = $repository->findByQuery($query);
224 224
         
225 225
             $userFilter = $this->filterManager->get('Auth/Entity/UserToSearchResult');
226
-            $filterFunc = function ($user) use ($userFilter) {
226
+            $filterFunc = function($user) use ($userFilter) {
227 227
                 return $userFilter->filter($user);
228 228
             };
229 229
             $result     = array_values(array_map($filterFunc, $users->toArray()));
Please login to merge, or discard this patch.
module/Auth/src/Auth/Controller/Plugin/Service/SocialProfilesFactory.php 2 patches
Indentation   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -16,12 +16,12 @@
 block discarded – undo
16 16
 
17 17
 class SocialProfilesFactory implements FactoryInterface
18 18
 {
19
-	public function __invoke( ContainerInterface $container, $requestedName, array $options = null )
20
-	{
21
-		$request = $container->get('request');
22
-		$hybridAuth = $container->get('HybridAuth');
23
-		$plugin     = new SocialProfiles($hybridAuth,$request);
19
+    public function __invoke( ContainerInterface $container, $requestedName, array $options = null )
20
+    {
21
+        $request = $container->get('request');
22
+        $hybridAuth = $container->get('HybridAuth');
23
+        $plugin     = new SocialProfiles($hybridAuth,$request);
24 24
 		
25
-		return $plugin;
26
-	}
25
+        return $plugin;
26
+    }
27 27
 }
Please login to merge, or discard this patch.
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -16,11 +16,11 @@
 block discarded – undo
16 16
 
17 17
 class SocialProfilesFactory implements FactoryInterface
18 18
 {
19
-	public function __invoke( ContainerInterface $container, $requestedName, array $options = null )
19
+	public function __invoke(ContainerInterface $container, $requestedName, array $options = null)
20 20
 	{
21 21
 		$request = $container->get('request');
22 22
 		$hybridAuth = $container->get('HybridAuth');
23
-		$plugin     = new SocialProfiles($hybridAuth,$request);
23
+		$plugin     = new SocialProfiles($hybridAuth, $request);
24 24
 		
25 25
 		return $plugin;
26 26
 	}
Please login to merge, or discard this patch.
module/Auth/src/Auth/Form/Validator/UniqueGroupNameFactory.php 2 patches
Indentation   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -37,14 +37,14 @@
 block discarded – undo
37 37
         $this->options['allowName'] = isset($options['allowName']) ? $options['allowName'] : null;
38 38
     }
39 39
 	
40
-	public function __invoke( ContainerInterface $container, $requestedName, array $options = null )
41
-	{
42
-		$auth      = $container->get('AuthenticationService');
43
-		$user      = $auth->getUser();
44
-		$options   = $this->options;
45
-		$options['user'] = $user;
46
-		$validator = new UniqueGroupName($options);
40
+    public function __invoke( ContainerInterface $container, $requestedName, array $options = null )
41
+    {
42
+        $auth      = $container->get('AuthenticationService');
43
+        $user      = $auth->getUser();
44
+        $options   = $this->options;
45
+        $options['user'] = $user;
46
+        $validator = new UniqueGroupName($options);
47 47
 		
48
-		return $validator;
49
-	}
48
+        return $validator;
49
+    }
50 50
 }
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -37,7 +37,7 @@
 block discarded – undo
37 37
         $this->options['allowName'] = isset($options['allowName']) ? $options['allowName'] : null;
38 38
     }
39 39
 	
40
-	public function __invoke( ContainerInterface $container, $requestedName, array $options = null )
40
+	public function __invoke(ContainerInterface $container, $requestedName, array $options = null)
41 41
 	{
42 42
 		$auth      = $container->get('AuthenticationService');
43 43
 		$user      = $auth->getUser();
Please login to merge, or discard this patch.
module/Auth/src/Auth/Form/UserImageFactory.php 1 patch
Indentation   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -55,8 +55,8 @@
 block discarded – undo
55 55
     {
56 56
         /* @var $options \Applications\Options\ModuleOptions */
57 57
         $form->get($this->fileName)->setViewHelper('formImageUpload')
58
-           ->setMaxSize($options->getContactImageMaxSize())
59
-           ->setAllowedTypes($options->getContactImageMimeType())
60
-           ->setForm($form);
58
+            ->setMaxSize($options->getContactImageMaxSize())
59
+            ->setAllowedTypes($options->getContactImageMimeType())
60
+            ->setForm($form);
61 61
     }
62 62
 }
Please login to merge, or discard this patch.
module/Auth/src/Auth/Form/UserPassword.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -56,6 +56,6 @@
 block discarded – undo
56 56
         $form = new static();
57 57
         $form->forms = $forms->get('FormElementManager');
58 58
         
59
-		return $form;
59
+        return $form;
60 60
     }
61 61
 }
Please login to merge, or discard this patch.
module/Organizations/config/module.config.php 2 patches
Indentation   +28 added lines, -28 removed lines patch added patch discarded remove patch
@@ -49,7 +49,7 @@  discard block
 block discarded – undo
49 49
 
50 50
     'controllers' => [
51 51
         'factories' => [
52
-	        'Organizations/InviteEmployee' => [\Organizations\Controller\InviteEmployeeController::class,'factory'],
52
+            'Organizations/InviteEmployee' => [\Organizations\Controller\InviteEmployeeController::class,'factory'],
53 53
             'Organizations/Index' => 'Organizations\Factory\Controller\IndexControllerFactory',
54 54
         ]
55 55
     ],
@@ -65,14 +65,14 @@  discard block
 block discarded – undo
65 65
     'view_manager' => [
66 66
         // Map template to files. Speeds up the lookup through the template stack.
67 67
         'template_map' => [
68
-             'organizations/index/edit' => __DIR__ . '/../view/organizations/index/form.phtml',
69
-             'organizations/form/employees-fieldset' => __DIR__ . '/../view/form/employees-fieldset.phtml',
70
-             'organizations/form/employee-fieldset' => __DIR__ .'/../view/form/employee-fieldset.phtml',
71
-             'organizations/form/invite-employee-bar' => __DIR__ . '/../view/form/invite-employee-bar.phtml',
72
-             'organizations/error/no-parent' => __DIR__ . '/../view/error/no-parent.phtml',
73
-             'organizations/error/invite' => __DIR__ . '/../view/error/invite.phtml',
74
-             'organizations/mail/invite-employee' => __DIR__ . '/../view/mail/invite-employee.phtml',
75
-             'organizations/form/workflow-fieldset' => __DIR__ . '/../view/form/workflow-fieldset.phtml',
68
+                'organizations/index/edit' => __DIR__ . '/../view/organizations/index/form.phtml',
69
+                'organizations/form/employees-fieldset' => __DIR__ . '/../view/form/employees-fieldset.phtml',
70
+                'organizations/form/employee-fieldset' => __DIR__ .'/../view/form/employee-fieldset.phtml',
71
+                'organizations/form/invite-employee-bar' => __DIR__ . '/../view/form/invite-employee-bar.phtml',
72
+                'organizations/error/no-parent' => __DIR__ . '/../view/error/no-parent.phtml',
73
+                'organizations/error/invite' => __DIR__ . '/../view/error/invite.phtml',
74
+                'organizations/mail/invite-employee' => __DIR__ . '/../view/mail/invite-employee.phtml',
75
+                'organizations/form/workflow-fieldset' => __DIR__ . '/../view/form/workflow-fieldset.phtml',
76 76
         ],
77 77
         // Where to look for view templates not mapped above
78 78
         'template_path_stack' => [
@@ -81,23 +81,23 @@  discard block
 block discarded – undo
81 81
     ],
82 82
     'form_elements' => [
83 83
         'invokables' => [
84
-             'Organizations/Form' => 'Organizations\Form\Organizations',
85
-             'Organizations/OrganizationsContactForm'     => 'Organizations\Form\OrganizationsContactForm',
86
-             'Organizations/OrganizationsNameForm'        => 'Organizations\Form\OrganizationsNameForm',
87
-             'Organizations/OrganizationsDescriptionForm' => 'Organizations\Form\OrganizationsDescriptionForm',
88
-             'Organizations/OrganizationsContactFieldset' => 'Organizations\Form\OrganizationsContactFieldset',
89
-             'Organizations/OrganizationsDescriptionFieldset' => 'Organizations\Form\OrganizationsDescriptionFieldset',
90
-             //'Organizations/OrganizationFieldset'       => 'Organizations\Form\OrganizationFieldset',
91
-             'Organizations/EmployeesContainer'           => 'Organizations\Form\EmployeesContainer',
92
-             'Organizations/Employees'                    => 'Organizations\Form\Employees',
93
-             'Organizations/InviteEmployeeBar'            => 'Organizations\Form\Element\InviteEmployeeBar',
94
-             'Organizations/Employee'                     => 'Organizations\Form\Element\Employee',
95
-             'Organizations/WorkflowSettings'             => 'Organizations\Form\WorkflowSettings',
96
-             'Organizations/WorkflowSettingsFieldset'     => 'Organizations\Form\WorkflowSettingsFieldset',
84
+                'Organizations/Form' => 'Organizations\Form\Organizations',
85
+                'Organizations/OrganizationsContactForm'     => 'Organizations\Form\OrganizationsContactForm',
86
+                'Organizations/OrganizationsNameForm'        => 'Organizations\Form\OrganizationsNameForm',
87
+                'Organizations/OrganizationsDescriptionForm' => 'Organizations\Form\OrganizationsDescriptionForm',
88
+                'Organizations/OrganizationsContactFieldset' => 'Organizations\Form\OrganizationsContactFieldset',
89
+                'Organizations/OrganizationsDescriptionFieldset' => 'Organizations\Form\OrganizationsDescriptionFieldset',
90
+                //'Organizations/OrganizationFieldset'       => 'Organizations\Form\OrganizationFieldset',
91
+                'Organizations/EmployeesContainer'           => 'Organizations\Form\EmployeesContainer',
92
+                'Organizations/Employees'                    => 'Organizations\Form\Employees',
93
+                'Organizations/InviteEmployeeBar'            => 'Organizations\Form\Element\InviteEmployeeBar',
94
+                'Organizations/Employee'                     => 'Organizations\Form\Element\Employee',
95
+                'Organizations/WorkflowSettings'             => 'Organizations\Form\WorkflowSettings',
96
+                'Organizations/WorkflowSettingsFieldset'     => 'Organizations\Form\WorkflowSettingsFieldset',
97 97
 
98 98
         ],
99 99
         'factories' => [
100
-	        'Organizations/OrganizationsNameFieldset'    => \Organizations\Factory\Form\OrganizationsNameFieldsetFactory::class,
100
+            'Organizations/OrganizationsNameFieldset'    => \Organizations\Factory\Form\OrganizationsNameFieldsetFactory::class,
101 101
             'Organizations/Image'                        => \Organizations\Form\LogoImageFactory::class,
102 102
             'Organizations/EmployeesFieldset'            => 'Organizations\Factory\Form\EmployeesFieldsetFactory',
103 103
             'Organizations/EmployeeFieldset'             => 'Organizations\Factory\Form\EmployeeFieldsetFactory',
@@ -194,13 +194,13 @@  discard block
 block discarded – undo
194 194
 
195 195
     'service_manager' => [
196 196
         'invokables' => [
197
-           'Organizations\Auth\Dependency\EmployeeListListener' => 'Organizations\Auth\Dependency\EmployeeListListener'
197
+            'Organizations\Auth\Dependency\EmployeeListListener' => 'Organizations\Auth\Dependency\EmployeeListListener'
198 198
         ],
199 199
         'factories' => [
200
-           'Organizations\Auth\Dependency\ListListener' => 'Organizations\Factory\Auth\Dependency\ListListenerFactory',
201
-           'Organizations\ImageFileCache\Manager' => 'Organizations\Factory\ImageFileCache\ManagerFactory',
202
-           'Organizations\ImageFileCache\ODMListener' => 'Organizations\Factory\ImageFileCache\ODMListenerFactory',
203
-           'Organizations\ImageFileCache\ApplicationListener' => 'Organizations\Factory\ImageFileCache\ApplicationListenerFactory',
200
+            'Organizations\Auth\Dependency\ListListener' => 'Organizations\Factory\Auth\Dependency\ListListenerFactory',
201
+            'Organizations\ImageFileCache\Manager' => 'Organizations\Factory\ImageFileCache\ManagerFactory',
202
+            'Organizations\ImageFileCache\ODMListener' => 'Organizations\Factory\ImageFileCache\ODMListenerFactory',
203
+            'Organizations\ImageFileCache\ApplicationListener' => 'Organizations\Factory\ImageFileCache\ApplicationListenerFactory',
204 204
         ],
205 205
     ],
206 206
 
Please login to merge, or discard this patch.
Spacing   +17 added lines, -17 removed lines patch added patch discarded remove patch
@@ -13,7 +13,7 @@  discard block
 block discarded – undo
13 13
                 ],
14 14
             ],
15 15
             'annotation' => [
16
-                'paths' => [ __DIR__ . '/../src/Organizations/Entity']
16
+                'paths' => [__DIR__.'/../src/Organizations/Entity']
17 17
             ],
18 18
         ],
19 19
         'eventmanager' => [
@@ -40,7 +40,7 @@  discard block
 block discarded – undo
40 40
         'translation_file_patterns' => [
41 41
             [
42 42
                 'type' => 'gettext',
43
-                'base_dir' => __DIR__ . '/../language',
43
+                'base_dir' => __DIR__.'/../language',
44 44
                 'pattern' => '%s.mo',
45 45
             ],
46 46
         ],
@@ -49,7 +49,7 @@  discard block
 block discarded – undo
49 49
 
50 50
     'controllers' => [
51 51
         'factories' => [
52
-	        'Organizations/InviteEmployee' => [\Organizations\Controller\InviteEmployeeController::class,'factory'],
52
+	        'Organizations/InviteEmployee' => [\Organizations\Controller\InviteEmployeeController::class, 'factory'],
53 53
             'Organizations/Index' => 'Organizations\Factory\Controller\IndexControllerFactory',
54 54
         ]
55 55
     ],
@@ -65,18 +65,18 @@  discard block
 block discarded – undo
65 65
     'view_manager' => [
66 66
         // Map template to files. Speeds up the lookup through the template stack.
67 67
         'template_map' => [
68
-             'organizations/index/edit' => __DIR__ . '/../view/organizations/index/form.phtml',
69
-             'organizations/form/employees-fieldset' => __DIR__ . '/../view/form/employees-fieldset.phtml',
70
-             'organizations/form/employee-fieldset' => __DIR__ .'/../view/form/employee-fieldset.phtml',
71
-             'organizations/form/invite-employee-bar' => __DIR__ . '/../view/form/invite-employee-bar.phtml',
72
-             'organizations/error/no-parent' => __DIR__ . '/../view/error/no-parent.phtml',
73
-             'organizations/error/invite' => __DIR__ . '/../view/error/invite.phtml',
74
-             'organizations/mail/invite-employee' => __DIR__ . '/../view/mail/invite-employee.phtml',
75
-             'organizations/form/workflow-fieldset' => __DIR__ . '/../view/form/workflow-fieldset.phtml',
68
+             'organizations/index/edit' => __DIR__.'/../view/organizations/index/form.phtml',
69
+             'organizations/form/employees-fieldset' => __DIR__.'/../view/form/employees-fieldset.phtml',
70
+             'organizations/form/employee-fieldset' => __DIR__.'/../view/form/employee-fieldset.phtml',
71
+             'organizations/form/invite-employee-bar' => __DIR__.'/../view/form/invite-employee-bar.phtml',
72
+             'organizations/error/no-parent' => __DIR__.'/../view/error/no-parent.phtml',
73
+             'organizations/error/invite' => __DIR__.'/../view/error/invite.phtml',
74
+             'organizations/mail/invite-employee' => __DIR__.'/../view/mail/invite-employee.phtml',
75
+             'organizations/form/workflow-fieldset' => __DIR__.'/../view/form/workflow-fieldset.phtml',
76 76
         ],
77 77
         // Where to look for view templates not mapped above
78 78
         'template_path_stack' => [
79
-            __DIR__ . '/../view',
79
+            __DIR__.'/../view',
80 80
         ],
81 81
     ],
82 82
     'form_elements' => [
@@ -146,11 +146,11 @@  discard block
 block discarded – undo
146 146
                 'allow' => [
147 147
                     'Entity/OrganizationImage',
148 148
                     'route/lang/organizations/invite',
149
-                    'Organizations/InviteEmployee' => [ 'accept' ],
149
+                    'Organizations/InviteEmployee' => ['accept'],
150 150
                 ],
151 151
                 'deny' => [
152 152
                     'route/lang/organizations',
153
-                    'Organizations/InviteEmployee' => [ 'invite' ],
153
+                    'Organizations/InviteEmployee' => ['invite'],
154 154
                 ],
155 155
             ],
156 156
             // recruiters are allowed to view their companies
@@ -158,7 +158,7 @@  discard block
 block discarded – undo
158 158
                 'allow' => [
159 159
                     'route/lang/organizations',
160 160
                     'Organizations/InviteEmployee',
161
-                    'Entity/Organization' => [ 'edit' => 'Organizations/Write' ],
161
+                    'Entity/Organization' => ['edit' => 'Organizations/Write'],
162 162
                 ],
163 163
             ],
164 164
         ],
@@ -174,8 +174,8 @@  discard block
 block discarded – undo
174 174
             'organizations' => [
175 175
                 'label' => 'Organizations',
176 176
                 'route' => 'lang/organizations',
177
-                'order' => 65,                             // allows to order the menu items
178
-                'resource' => 'route/lang/organizations',  // if a resource is defined, the acl will be applied.
177
+                'order' => 65, // allows to order the menu items
178
+                'resource' => 'route/lang/organizations', // if a resource is defined, the acl will be applied.
179 179
 
180 180
                 'pages' => [
181 181
                     'list' => [
Please login to merge, or discard this patch.
src/Organizations/Entity/Hydrator/OrganizationHydratorFactory.php 2 patches
Indentation   +13 added lines, -13 removed lines patch added patch discarded remove patch
@@ -17,18 +17,18 @@
 block discarded – undo
17 17
 
18 18
 class OrganizationHydratorFactory implements FactoryInterface
19 19
 {
20
-	public function __invoke( ContainerInterface $container, $requestedName, array $options = null ) {
21
-		$repositoryManager = $container->get('repositories');
22
-		$repOrganization = $repositoryManager->get('Organizations/Organization');
23
-		$repOrganizationName = $repositoryManager->get('Organizations/OrganizationName');
24
-		$repOrganizationImage = $repositoryManager->get('Organizations/OrganizationImage');
25
-		$object = new OrganizationHydrator($repOrganization, $repOrganizationName, $repOrganizationImage);
20
+    public function __invoke( ContainerInterface $container, $requestedName, array $options = null ) {
21
+        $repositoryManager = $container->get('repositories');
22
+        $repOrganization = $repositoryManager->get('Organizations/Organization');
23
+        $repOrganizationName = $repositoryManager->get('Organizations/OrganizationName');
24
+        $repOrganizationImage = $repositoryManager->get('Organizations/OrganizationImage');
25
+        $object = new OrganizationHydrator($repOrganization, $repOrganizationName, $repOrganizationImage);
26 26
 		
27
-		// injecting the strategies
28
-		$httpload = new HttploadStrategy($repOrganizationImage);
29
-		$organizationName = new OrganizationNameStrategy($repOrganizationName);
30
-		$object->addStrategy('image', $httpload);
31
-		$object->addStrategy('organizationName', $organizationName);
32
-		return $object;
33
-	}
27
+        // injecting the strategies
28
+        $httpload = new HttploadStrategy($repOrganizationImage);
29
+        $organizationName = new OrganizationNameStrategy($repOrganizationName);
30
+        $object->addStrategy('image', $httpload);
31
+        $object->addStrategy('organizationName', $organizationName);
32
+        return $object;
33
+    }
34 34
 }
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -17,7 +17,7 @@
 block discarded – undo
17 17
 
18 18
 class OrganizationHydratorFactory implements FactoryInterface
19 19
 {
20
-	public function __invoke( ContainerInterface $container, $requestedName, array $options = null ) {
20
+	public function __invoke(ContainerInterface $container, $requestedName, array $options = null) {
21 21
 		$repositoryManager = $container->get('repositories');
22 22
 		$repOrganization = $repositoryManager->get('Organizations/Organization');
23 23
 		$repOrganizationName = $repositoryManager->get('Organizations/OrganizationName');
Please login to merge, or discard this patch.
src/Organizations/Factory/Controller/IndexControllerFactory.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -33,6 +33,6 @@
 block discarded – undo
33 33
         $viewHelper = $container->get('ViewHelperManager');
34 34
         $translator = $container->get('translator');
35 35
 
36
-        return new IndexController($form, $organizationRepository,$translator,$formManager,$viewHelper);
36
+        return new IndexController($form, $organizationRepository, $translator, $formManager, $viewHelper);
37 37
     }
38 38
 }
Please login to merge, or discard this patch.
src/Organizations/Factory/Controller/Plugin/InvitationHandlerFactory.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -26,7 +26,7 @@
 block discarded – undo
26 26
 {
27 27
     public function __invoke(ContainerInterface $container, $requestedName, array $options = null)
28 28
     {
29
-    	// @TODO: [ZF3] Check if InvitationHandlerFactory still working properly
29
+        // @TODO: [ZF3] Check if InvitationHandlerFactory still working properly
30 30
 	    
31 31
         /* @var $container \Zend\Mvc\Controller\PluginManager */
32 32
         $validator  = $container->get('ValidatorManager')->get('EmailAddress');
Please login to merge, or discard this patch.