Passed
Pull Request — master (#631)
by ANTHONIUS
08:16
created
module/Organizations/config/module.config.php 1 patch
Indentation   +28 added lines, -28 removed lines patch added patch discarded remove patch
@@ -66,14 +66,14 @@  discard block
 block discarded – undo
66 66
     'view_manager' => [
67 67
         // Map template to files. Speeds up the lookup through the template stack.
68 68
         'template_map' => [
69
-             'organizations/index/edit' => __DIR__ . '/../view/organizations/index/form.phtml',
70
-             'organizations/form/employees-fieldset' => __DIR__ . '/../view/form/employees-fieldset.phtml',
71
-             'organizations/form/employee-fieldset' => __DIR__ .'/../view/form/employee-fieldset.phtml',
72
-             'organizations/form/invite-employee-bar' => __DIR__ . '/../view/form/invite-employee-bar.phtml',
73
-             'organizations/error/no-parent' => __DIR__ . '/../view/error/no-parent.phtml',
74
-             'organizations/error/invite' => __DIR__ . '/../view/error/invite.phtml',
75
-             'organizations/mail/invite-employee' => __DIR__ . '/../view/mail/invite-employee.phtml',
76
-             'organizations/form/workflow-fieldset' => __DIR__ . '/../view/form/workflow-fieldset.phtml',
69
+                'organizations/index/edit' => __DIR__ . '/../view/organizations/index/form.phtml',
70
+                'organizations/form/employees-fieldset' => __DIR__ . '/../view/form/employees-fieldset.phtml',
71
+                'organizations/form/employee-fieldset' => __DIR__ .'/../view/form/employee-fieldset.phtml',
72
+                'organizations/form/invite-employee-bar' => __DIR__ . '/../view/form/invite-employee-bar.phtml',
73
+                'organizations/error/no-parent' => __DIR__ . '/../view/error/no-parent.phtml',
74
+                'organizations/error/invite' => __DIR__ . '/../view/error/invite.phtml',
75
+                'organizations/mail/invite-employee' => __DIR__ . '/../view/mail/invite-employee.phtml',
76
+                'organizations/form/workflow-fieldset' => __DIR__ . '/../view/form/workflow-fieldset.phtml',
77 77
             'organizations/profile/disabled' => __DIR__ . '/../view/organizations/profile/disabled.phtml',
78 78
         ],
79 79
         // Where to look for view templates not mapped above
@@ -83,21 +83,21 @@  discard block
 block discarded – undo
83 83
     ],
84 84
     'form_elements' => [
85 85
         'invokables' => [
86
-             'Organizations/Form' => 'Organizations\Form\Organizations',
87
-             'Organizations/OrganizationsContactForm'     => 'Organizations\Form\OrganizationsContactForm',
88
-             'Organizations/OrganizationsNameForm'        => 'Organizations\Form\OrganizationsNameForm',
89
-             'Organizations/OrganizationsDescriptionForm' => 'Organizations\Form\OrganizationsDescriptionForm',
90
-             'Organizations/OrganizationsContactFieldset' => 'Organizations\Form\OrganizationsContactFieldset',
91
-             'Organizations/OrganizationsDescriptionFieldset' => 'Organizations\Form\OrganizationsDescriptionFieldset',
92
-             //'Organizations/OrganizationFieldset'       => 'Organizations\Form\OrganizationFieldset',
93
-             'Organizations/EmployeesContainer'           => 'Organizations\Form\EmployeesContainer',
94
-             'Organizations/Employees'                    => 'Organizations\Form\Employees',
95
-             'Organizations/InviteEmployeeBar'            => 'Organizations\Form\Element\InviteEmployeeBar',
96
-             'Organizations/Employee'                     => 'Organizations\Form\Element\Employee',
97
-             'Organizations/WorkflowSettings'             => 'Organizations\Form\WorkflowSettings',
98
-             'Organizations/WorkflowSettingsFieldset'     => 'Organizations\Form\WorkflowSettingsFieldset',
99
-             'Organizations/Profile'                      => \Organizations\Form\OrganizationsProfileForm::class,
100
-             'Organizations/ProfileFieldset'              => \Organizations\Form\OrganizationsProfileFieldset::class
86
+                'Organizations/Form' => 'Organizations\Form\Organizations',
87
+                'Organizations/OrganizationsContactForm'     => 'Organizations\Form\OrganizationsContactForm',
88
+                'Organizations/OrganizationsNameForm'        => 'Organizations\Form\OrganizationsNameForm',
89
+                'Organizations/OrganizationsDescriptionForm' => 'Organizations\Form\OrganizationsDescriptionForm',
90
+                'Organizations/OrganizationsContactFieldset' => 'Organizations\Form\OrganizationsContactFieldset',
91
+                'Organizations/OrganizationsDescriptionFieldset' => 'Organizations\Form\OrganizationsDescriptionFieldset',
92
+                //'Organizations/OrganizationFieldset'       => 'Organizations\Form\OrganizationFieldset',
93
+                'Organizations/EmployeesContainer'           => 'Organizations\Form\EmployeesContainer',
94
+                'Organizations/Employees'                    => 'Organizations\Form\Employees',
95
+                'Organizations/InviteEmployeeBar'            => 'Organizations\Form\Element\InviteEmployeeBar',
96
+                'Organizations/Employee'                     => 'Organizations\Form\Element\Employee',
97
+                'Organizations/WorkflowSettings'             => 'Organizations\Form\WorkflowSettings',
98
+                'Organizations/WorkflowSettingsFieldset'     => 'Organizations\Form\WorkflowSettingsFieldset',
99
+                'Organizations/Profile'                      => \Organizations\Form\OrganizationsProfileForm::class,
100
+                'Organizations/ProfileFieldset'              => \Organizations\Form\OrganizationsProfileFieldset::class
101 101
         ],
102 102
         'factories' => [
103 103
             'Organizations/OrganizationsNameFieldset'    => \Organizations\Factory\Form\OrganizationsNameFieldsetFactory::class,
@@ -212,13 +212,13 @@  discard block
 block discarded – undo
212 212
 
213 213
     'service_manager' => [
214 214
         'invokables' => [
215
-           'Organizations\Auth\Dependency\EmployeeListListener' => 'Organizations\Auth\Dependency\EmployeeListListener'
215
+            'Organizations\Auth\Dependency\EmployeeListListener' => 'Organizations\Auth\Dependency\EmployeeListListener'
216 216
         ],
217 217
         'factories' => [
218
-           'Organizations\Auth\Dependency\ListListener' => 'Organizations\Factory\Auth\Dependency\ListListenerFactory',
219
-           'Organizations\ImageFileCache\Manager' => 'Organizations\Factory\ImageFileCache\ManagerFactory',
220
-           'Organizations\ImageFileCache\ODMListener' => 'Organizations\Factory\ImageFileCache\ODMListenerFactory',
221
-           'Organizations\ImageFileCache\ApplicationListener' => 'Organizations\Factory\ImageFileCache\ApplicationListenerFactory',
218
+            'Organizations\Auth\Dependency\ListListener' => 'Organizations\Factory\Auth\Dependency\ListListenerFactory',
219
+            'Organizations\ImageFileCache\Manager' => 'Organizations\Factory\ImageFileCache\ManagerFactory',
220
+            'Organizations\ImageFileCache\ODMListener' => 'Organizations\Factory\ImageFileCache\ODMListenerFactory',
221
+            'Organizations\ImageFileCache\ApplicationListener' => 'Organizations\Factory\ImageFileCache\ApplicationListenerFactory',
222 222
             \Organizations\Service\UploadHandler::class => [\Organizations\Service\UploadHandler::class, 'factory'],
223 223
         ],
224 224
     ],
Please login to merge, or discard this patch.
etc/gitlab/autoload/module.auth.local.php 1 patch
Indentation   +14 added lines, -14 removed lines patch added patch discarded remove patch
@@ -6,7 +6,7 @@  discard block
 block discarded – undo
6 6
 $LINKEDIN_APP_SECRET    = getenv('LINKEDIN_APP_SECRET');
7 7
 
8 8
 return array(
9
-	'hybridauth' => array(
9
+    'hybridauth' => array(
10 10
         "Facebook" => array ( 
11 11
             "enabled" => true,
12 12
             "keys"    => array ( "id" => $FACEBOOK_APP_ID, "secret" => $FACEBOOK_APP_SECRET ),
@@ -30,13 +30,13 @@  discard block
 block discarded – undo
30 30
             "scope"   => ''
31 31
         ),
32 32
         "Google" => array(
33
-             // see http://hybridauth.sourceforge.net/userguide/IDProvider_info_Google.html
34
-             "enabled" => false,
35
-             'keys'    => array ( "id" => '###Your Google Client-ID ###', 'secret' => '###Your GitHub Secret###'),
36
-             "scope"   => "https://www.googleapis.com/auth/userinfo.profile ". // optional
37
-                          "https://www.googleapis.com/auth/userinfo.email"   , // optional
38
-             "access_type"     => "offline",   // optional
39
-             "approval_prompt" => "force",     // optional
33
+                // see http://hybridauth.sourceforge.net/userguide/IDProvider_info_Google.html
34
+                "enabled" => false,
35
+                'keys'    => array ( "id" => '###Your Google Client-ID ###', 'secret' => '###Your GitHub Secret###'),
36
+                "scope"   => "https://www.googleapis.com/auth/userinfo.profile ". // optional
37
+                            "https://www.googleapis.com/auth/userinfo.email"   , // optional
38
+                "access_type"     => "offline",   // optional
39
+                "approval_prompt" => "force",     // optional
40 40
         ),
41 41
 
42 42
 
@@ -47,12 +47,12 @@  discard block
 block discarded – undo
47 47
     ),
48 48
     
49 49
     'Auth' => array(
50
-    	'first_login' => array (
51
-    	    'role' => '%%role%%',                                            // role set on the first login.
52
-    	    'auth_suffix' => '%%auth.suffix%%',                              // an auth suffix is needed, if you plan to add external apps.
53
-    	),
54
-    	// this allows an external application to use the YAWIK API
55
-    	// applications[USERPOSTFIX] => AppKey
50
+        'first_login' => array (
51
+            'role' => '%%role%%',                                            // role set on the first login.
52
+            'auth_suffix' => '%%auth.suffix%%',                              // an auth suffix is needed, if you plan to add external apps.
53
+        ),
54
+        // this allows an external application to use the YAWIK API
55
+        // applications[USERPOSTFIX] => AppKey
56 56
         'external_applications' => array(
57 57
             '%%external.app.prefix%%' => '%%external.app.key%%',
58 58
         ),
Please login to merge, or discard this patch.