Completed
Pull Request — develop (#303)
by
unknown
10:41
created
module/Organizations/src/Organizations/Image/FileCache.php 2 patches
Doc Comments   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -79,7 +79,6 @@  discard block
 block discarded – undo
79 79
     /**
80 80
      * Creates and injects the organization reference to an user entity.
81 81
      *
82
-     * @param LifecycleEventArgs $args
83 82
      */
84 83
     public function preUpdate(PreUpdateEventArgs $eventArgs)
85 84
     {
@@ -107,7 +106,7 @@  discard block
 block discarded – undo
107 106
     }
108 107
 
109 108
     /**
110
-     * @param LifecycleEventArgs $eventArgs
109
+     * @param PostFlushEventArgs $eventArgs
111 110
      */
112 111
     public function postFlush(PostFlushEventArgs $eventArgs)
113 112
     {
Please login to merge, or discard this patch.
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -86,19 +86,19 @@  discard block
 block discarded – undo
86 86
         $organization = $eventArgs->getDocument();
87 87
         
88 88
         // check for a organization instance
89
-        if (! $organization instanceof Organization) {
89
+        if (!$organization instanceof Organization) {
90 90
             return;
91 91
         }
92 92
         
93 93
         // check if the image has been changed
94
-        if (! $eventArgs->hasChangedField('image')) {
94
+        if (!$eventArgs->hasChangedField('image')) {
95 95
             return;
96 96
         }
97 97
         
98 98
         $image = $eventArgs->getOldValue('image');
99 99
         
100 100
         // check if any image existed
101
-        if (! $image instanceof OrganizationImage) {
101
+        if (!$image instanceof OrganizationImage) {
102 102
             return;
103 103
         }
104 104
         
@@ -129,11 +129,11 @@  discard block
 block discarded – undo
129 129
         
130 130
         // try match uri pattern
131 131
         $uri = $event->getRequest()->getRequestUri();
132
-        $pattern = '#^' . preg_quote($this->uriPath, '#') . '/[0-9a-z]/[0-9a-z]/([0-9a-z]+)\.[a-zA-Z]{3,4}$#';
132
+        $pattern = '#^'.preg_quote($this->uriPath, '#').'/[0-9a-z]/[0-9a-z]/([0-9a-z]+)\.[a-zA-Z]{3,4}$#';
133 133
         $matches = [];
134 134
         preg_match($pattern, $uri, $matches);
135 135
         
136
-        if (! isset($matches[1])) {
136
+        if (!isset($matches[1])) {
137 137
             // uri does not match organization image path
138 138
             return;
139 139
         }
@@ -144,7 +144,7 @@  discard block
 block discarded – undo
144 144
         $repository = $serviceManager->get('repositories')->get('Organizations/OrganizationImage');
145 145
         $image = $repository->find($id);
146 146
         
147
-        if (! $image) {
147
+        if (!$image) {
148 148
             // abort if image does not exist
149 149
             return;
150 150
         }
@@ -202,7 +202,7 @@  discard block
 block discarded – undo
202 202
     {
203 203
         $dir = rtrim($dir, '/\\');
204 204
         
205
-        if (! is_dir($dir)) {
205
+        if (!is_dir($dir)) {
206 206
             $this->createDirectoryRecursively(dirname($dir));
207 207
             
208 208
             $oldUmask = umask(0);
Please login to merge, or discard this patch.
module/Organizations/config/module.config.php 2 patches
Indentation   +24 added lines, -24 removed lines patch added patch discarded remove patch
@@ -72,13 +72,13 @@  discard block
 block discarded – undo
72 72
     'view_manager' => array(
73 73
         // Map template to files. Speeds up the lookup through the template stack.
74 74
         'template_map' => array(
75
-             'organizations/index/edit' => __DIR__ . '/../view/organizations/index/form.phtml',
76
-             'organizations/form/employees-fieldset' => __DIR__ . '/../view/form/employees-fieldset.phtml',
77
-             'organizations/form/employee-fieldset' => __DIR__ .'/../view/form/employee-fieldset.phtml',
78
-             'organizations/form/invite-employee-bar' => __DIR__ . '/../view/form/invite-employee-bar.phtml',
79
-             'organizations/error/no-parent' => __DIR__ . '/../view/error/no-parent.phtml',
80
-             'organizations/error/invite' => __DIR__ . '/../view/error/invite.phtml',
81
-             'organizations/mail/invite-employee' => __DIR__ . '/../view/mail/invite-employee.phtml',
75
+                'organizations/index/edit' => __DIR__ . '/../view/organizations/index/form.phtml',
76
+                'organizations/form/employees-fieldset' => __DIR__ . '/../view/form/employees-fieldset.phtml',
77
+                'organizations/form/employee-fieldset' => __DIR__ .'/../view/form/employee-fieldset.phtml',
78
+                'organizations/form/invite-employee-bar' => __DIR__ . '/../view/form/invite-employee-bar.phtml',
79
+                'organizations/error/no-parent' => __DIR__ . '/../view/error/no-parent.phtml',
80
+                'organizations/error/invite' => __DIR__ . '/../view/error/invite.phtml',
81
+                'organizations/mail/invite-employee' => __DIR__ . '/../view/mail/invite-employee.phtml',
82 82
             'organizations/form/workflow-fieldset' => __DIR__ . '/../view/form/workflow-fieldset.phtml',
83 83
         ),
84 84
         // Where to look for view templates not mapped above
@@ -88,20 +88,20 @@  discard block
 block discarded – undo
88 88
     ),
89 89
     'form_elements' => array(
90 90
         'invokables' => array(
91
-             'Organizations/form' => 'Organizations\Form\Organizations',
92
-             'Organizations/OrganizationsContactForm'     => 'Organizations\Form\OrganizationsContactForm',
93
-             'Organizations/OrganizationsNameForm'        => 'Organizations\Form\OrganizationsNameForm',
94
-             'Organizations/OrganizationsDescriptionForm' => 'Organizations\Form\OrganizationsDescriptionForm',
95
-             'Organizations/OrganizationsContactFieldset' => 'Organizations\Form\OrganizationsContactFieldset',
96
-             'Organizations/OrganizationsNameFieldset'    => 'Organizations\Form\OrganizationsNameFieldset',
97
-             'Organizations/OrganizationsDescriptionFieldset' => 'Organizations\Form\OrganizationsDescriptionFieldset',
98
-             //'Organizations/OrganizationFieldset'       => 'Organizations\Form\OrganizationFieldset',
99
-             'Organizations/EmployeesContainer'           => 'Organizations\Form\EmployeesContainer',
100
-             'Organizations/Employees'                    => 'Organizations\Form\Employees',
101
-             'Organizations/InviteEmployeeBar'            => 'Organizations\Form\Element\InviteEmployeeBar',
102
-             'Organizations/Employee'                     => 'Organizations\Form\Element\Employee',
103
-             'Organizations/WorkflowSettings'             => 'Organizations\Form\WorkflowSettings',
104
-             'Organizations/WorkflowSettingsFieldset'     => 'Organizations\Form\WorkflowSettingsFieldset',
91
+                'Organizations/form' => 'Organizations\Form\Organizations',
92
+                'Organizations/OrganizationsContactForm'     => 'Organizations\Form\OrganizationsContactForm',
93
+                'Organizations/OrganizationsNameForm'        => 'Organizations\Form\OrganizationsNameForm',
94
+                'Organizations/OrganizationsDescriptionForm' => 'Organizations\Form\OrganizationsDescriptionForm',
95
+                'Organizations/OrganizationsContactFieldset' => 'Organizations\Form\OrganizationsContactFieldset',
96
+                'Organizations/OrganizationsNameFieldset'    => 'Organizations\Form\OrganizationsNameFieldset',
97
+                'Organizations/OrganizationsDescriptionFieldset' => 'Organizations\Form\OrganizationsDescriptionFieldset',
98
+                //'Organizations/OrganizationFieldset'       => 'Organizations\Form\OrganizationFieldset',
99
+                'Organizations/EmployeesContainer'           => 'Organizations\Form\EmployeesContainer',
100
+                'Organizations/Employees'                    => 'Organizations\Form\Employees',
101
+                'Organizations/InviteEmployeeBar'            => 'Organizations\Form\Element\InviteEmployeeBar',
102
+                'Organizations/Employee'                     => 'Organizations\Form\Element\Employee',
103
+                'Organizations/WorkflowSettings'             => 'Organizations\Form\WorkflowSettings',
104
+                'Organizations/WorkflowSettingsFieldset'     => 'Organizations\Form\WorkflowSettingsFieldset',
105 105
 
106 106
         ),
107 107
         'factories' => array(
@@ -191,11 +191,11 @@  discard block
 block discarded – undo
191 191
     ),
192 192
     'service_manager' => [
193 193
         'invokables' => [
194
-           'Organizations\Auth\Dependency\EmployeeListListener' => 'Organizations\Auth\Dependency\EmployeeListListener'
194
+            'Organizations\Auth\Dependency\EmployeeListListener' => 'Organizations\Auth\Dependency\EmployeeListListener'
195 195
         ],
196 196
         'factories' => [
197
-           'Organizations\Auth\Dependency\ListListener' => 'Organizations\Factory\Auth\Dependency\ListListenerFactory',
198
-           'Organizations\Image\FileCache' => 'Organizations\Factory\Image\FileCacheFactory'
197
+            'Organizations\Auth\Dependency\ListListener' => 'Organizations\Factory\Auth\Dependency\ListListenerFactory',
198
+            'Organizations\Image\FileCache' => 'Organizations\Factory\Image\FileCacheFactory'
199 199
         ]
200 200
     ],
201 201
     'event_manager' => [
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' => array(
16
-                'paths' => array( __DIR__ . '/../src/Organizations/Entity')
16
+                'paths' => array(__DIR__.'/../src/Organizations/Entity')
17 17
             ),
18 18
         ),
19 19
         'eventmanager' => array(
@@ -35,7 +35,7 @@  discard block
 block discarded – undo
35 35
             ),
36 36
         ),
37 37
         'ImageFileCache' => [
38
-            'filePath' => __DIR__ . '/../../../public/cache/Organizations/Image',
38
+            'filePath' => __DIR__.'/../../../public/cache/Organizations/Image',
39 39
             'uriPath' => '/cache/Organizations/Image'
40 40
         ]
41 41
     ),
@@ -44,7 +44,7 @@  discard block
 block discarded – undo
44 44
         'translation_file_patterns' => array(
45 45
             array(
46 46
                 'type' => 'gettext',
47
-                'base_dir' => __DIR__ . '/../language',
47
+                'base_dir' => __DIR__.'/../language',
48 48
                 'pattern' => '%s.mo',
49 49
             ),
50 50
         ),
@@ -72,18 +72,18 @@  discard block
 block discarded – undo
72 72
     'view_manager' => array(
73 73
         // Map template to files. Speeds up the lookup through the template stack.
74 74
         'template_map' => array(
75
-             'organizations/index/edit' => __DIR__ . '/../view/organizations/index/form.phtml',
76
-             'organizations/form/employees-fieldset' => __DIR__ . '/../view/form/employees-fieldset.phtml',
77
-             'organizations/form/employee-fieldset' => __DIR__ .'/../view/form/employee-fieldset.phtml',
78
-             'organizations/form/invite-employee-bar' => __DIR__ . '/../view/form/invite-employee-bar.phtml',
79
-             'organizations/error/no-parent' => __DIR__ . '/../view/error/no-parent.phtml',
80
-             'organizations/error/invite' => __DIR__ . '/../view/error/invite.phtml',
81
-             'organizations/mail/invite-employee' => __DIR__ . '/../view/mail/invite-employee.phtml',
82
-            'organizations/form/workflow-fieldset' => __DIR__ . '/../view/form/workflow-fieldset.phtml',
75
+             'organizations/index/edit' => __DIR__.'/../view/organizations/index/form.phtml',
76
+             'organizations/form/employees-fieldset' => __DIR__.'/../view/form/employees-fieldset.phtml',
77
+             'organizations/form/employee-fieldset' => __DIR__.'/../view/form/employee-fieldset.phtml',
78
+             'organizations/form/invite-employee-bar' => __DIR__.'/../view/form/invite-employee-bar.phtml',
79
+             'organizations/error/no-parent' => __DIR__.'/../view/error/no-parent.phtml',
80
+             'organizations/error/invite' => __DIR__.'/../view/error/invite.phtml',
81
+             'organizations/mail/invite-employee' => __DIR__.'/../view/mail/invite-employee.phtml',
82
+            'organizations/form/workflow-fieldset' => __DIR__.'/../view/form/workflow-fieldset.phtml',
83 83
         ),
84 84
         // Where to look for view templates not mapped above
85 85
         'template_path_stack' => array(
86
-            __DIR__ . '/../view',
86
+            __DIR__.'/../view',
87 87
         ),
88 88
     ),
89 89
     'form_elements' => array(
@@ -144,11 +144,11 @@  discard block
 block discarded – undo
144 144
                 'allow' => array(
145 145
                     'Entity/OrganizationImage',
146 146
                     'route/lang/organizations/invite',
147
-                    'Organizations/InviteEmployee' => [ 'accept' ],
147
+                    'Organizations/InviteEmployee' => ['accept'],
148 148
                 ),
149 149
                 'deny' => array(
150 150
                     'route/lang/organizations',
151
-                    'Organizations/InviteEmployee' => [ 'invite' ],
151
+                    'Organizations/InviteEmployee' => ['invite'],
152 152
                 ),
153 153
             ),
154 154
             // recruiters are allowed to view their companies
@@ -156,7 +156,7 @@  discard block
 block discarded – undo
156 156
                 'allow' => array(
157 157
                     'route/lang/organizations',
158 158
                     'Organizations/InviteEmployee',
159
-                    'Entity/Organization' => [ 'edit' => 'Organizations/Write' ],
159
+                    'Entity/Organization' => ['edit' => 'Organizations/Write'],
160 160
                 ),
161 161
             ),
162 162
         ),
@@ -172,8 +172,8 @@  discard block
 block discarded – undo
172 172
             'organizations' => array(
173 173
                 'label' => 'Organizations',
174 174
                 'route' => 'lang/organizations',
175
-                'order' => 65,                             // allows to order the menu items
176
-                'resource' => 'route/lang/organizations',  // if a resource is defined, the acl will be applied.
175
+                'order' => 65, // allows to order the menu items
176
+                'resource' => 'route/lang/organizations', // if a resource is defined, the acl will be applied.
177 177
 
178 178
                 'pages' => array(
179 179
                     'list' => array(
Please login to merge, or discard this patch.