Completed
Pull Request — develop (#359)
by Mathias
23:51
created
module/Core/src/Core/Entity/ImageSetInterface.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -59,7 +59,7 @@
 block discarded – undo
59 59
      * @param array                $images
60 60
      * @param PermissionsInterface $permissions
61 61
      *
62
-     * @return mixed
62
+     * @return ImageSet
63 63
      */
64 64
     public function setImages(array $images, PermissionsInterface $permissions = null);
65 65
 
Please login to merge, or discard this patch.
module/Core/config/module.config.php 1 patch
Spacing   +31 added lines, -31 removed lines patch added patch discarded remove patch
@@ -12,7 +12,7 @@  discard block
 block discarded – undo
12 12
  * @license   MIT
13 13
  */
14 14
 
15
-$doctrineConfig = include __DIR__ . '/doctrine.config.php';
15
+$doctrineConfig = include __DIR__.'/doctrine.config.php';
16 16
 
17 17
 
18 18
 return [
@@ -20,7 +20,7 @@  discard block
 block discarded – undo
20 20
     'doctrine' => $doctrineConfig,
21 21
 
22 22
     'options' => [
23
-        'Core/MailServiceOptions' => [ 'class' => '\Core\Options\MailServiceOptions' ],
23
+        'Core/MailServiceOptions' => ['class' => '\Core\Options\MailServiceOptions'],
24 24
         \Core\Options\ImagineOptions::class => [],
25 25
         ],
26 26
     
@@ -41,7 +41,7 @@  discard block
 block discarded – undo
41 41
                      'name' => 'stream',
42 42
                     'priority' => 1000,
43 43
                     'options' => [
44
-                         'stream' => __DIR__ .'/../../../log/yawik.log',
44
+                         'stream' => __DIR__.'/../../../log/yawik.log',
45 45
                     ],
46 46
                  ],
47 47
             ],
@@ -52,7 +52,7 @@  discard block
 block discarded – undo
52 52
                      'name' => 'stream',
53 53
                     'priority' => 1000,
54 54
                     'options' => [
55
-                         'stream' => __DIR__ .'/../../../log/mails.log',
55
+                         'stream' => __DIR__.'/../../../log/mails.log',
56 56
                     ],
57 57
                  ],
58 58
             ],
@@ -60,7 +60,7 @@  discard block
 block discarded – undo
60 60
         'ErrorLogger' => [
61 61
             'service' => 'Core/ErrorLogger',
62 62
             'config'  => [
63
-                'stream' => __DIR__ . '/../../../log/error.log',
63
+                'stream' => __DIR__.'/../../../log/error.log',
64 64
                 'log_errors' => true,
65 65
                 'log_exceptions' => true,
66 66
             ],
@@ -78,7 +78,7 @@  discard block
 block discarded – undo
78 78
         'mode' => true, // true = production|false = development|null = autodetect|IP address(es) csv/array
79 79
         'bar' => false, // bool = enabled|Toggle nette diagnostics bar.
80 80
         'strict' => true, // bool = cause immediate death|int = matched against error severity
81
-        'log' => __DIR__ . '/../../../log/tracy', // path to log directory (this directory keeps error.log, snoozing mailsent file & html exception trace files)
81
+        'log' => __DIR__.'/../../../log/tracy', // path to log directory (this directory keeps error.log, snoozing mailsent file & html exception trace files)
82 82
         'email' => null, // in production mode notifies the recipient
83 83
         'email_snooze' => 900 // interval for sending email in seconds
84 84
     ],
@@ -235,17 +235,17 @@  discard block
 block discarded – undo
235 235
         'translation_file_patterns' => [
236 236
             [
237 237
                 'type' => 'gettext',
238
-                'base_dir' => __DIR__ . '/../language',
238
+                'base_dir' => __DIR__.'/../language',
239 239
                 'pattern' => '%s.mo',
240 240
             ],
241 241
             [
242 242
                 'type'     => 'phparray',
243
-                'base_dir' => __DIR__ . '/../language',
243
+                'base_dir' => __DIR__.'/../language',
244 244
                 'pattern' => 'Zend_Validate.%s.php',
245 245
             ],
246 246
             [
247 247
                 'type'     => 'phparray',
248
-                'base_dir' => __DIR__ . '/../language',
248
+                'base_dir' => __DIR__.'/../language',
249 249
                 'pattern' => 'Zend_Captcha.%s.php',
250 250
             ]
251 251
         ],
@@ -314,32 +314,32 @@  discard block
 block discarded – undo
314 314
         'exception_template' => 'error/index',
315 315
         // Map template to files. Speeds up the lookup through the template stack.
316 316
         'template_map' => [
317
-            'noscript-notice' => __DIR__ . '/../view/layout/_noscript-notice.phtml',
318
-            'layout/layout' => __DIR__ . '/../view/layout/layout.phtml',
319
-            'error/404' => __DIR__ . '/../view/error/404.phtml',
320
-            'error/403' => __DIR__ . '/../view/error/403.phtml',
321
-            'error/index' => __DIR__ . '/../view/error/index.phtml',
322
-            'main-navigation' => __DIR__ . '/../view/partial/main-navigation.phtml',
323
-            'pagination-control' => __DIR__ . '/../view/partial/pagination-control.phtml',
324
-            'core/loading-popup' => __DIR__ . '/../view/partial/loading-popup.phtml',
325
-            'core/notifications' => __DIR__ . '/../view/partial/notifications.phtml',
326
-            'form/core/buttons' => __DIR__ . '/../view/form/buttons.phtml',
327
-            'core/social-buttons' => __DIR__ . '/../view/partial/social-buttons.phtml',
328
-            'form/core/privacy' => __DIR__ . '/../view/form/privacy.phtml',
329
-            'core/form/permissions-fieldset' => __DIR__ . '/../view/form/permissions-fieldset.phtml',
330
-            'core/form/permissions-collection' => __DIR__ . '/../view/form/permissions-collection.phtml',
331
-            'core/form/container-view' => __DIR__ . '/../view/form/container.view.phtml',
332
-            'core/form/tree-manage.view' => __DIR__ . '/../view/form/tree-manage.view.phtml',
333
-            'core/form/tree-manage.form' => __DIR__ . '/../view/form/tree-manage.form.phtml',
334
-            'core/form/tree-add-item' => __DIR__ . '/../view/form/tree-add-item.phtml',
335
-            'mail/header' =>  __DIR__ . '/../view/mail/header.phtml',
336
-            'mail/footer' =>  __DIR__ . '/../view/mail/footer.phtml',
337
-            'mail/footer.en' =>  __DIR__ . '/../view/mail/footer.en.phtml',
317
+            'noscript-notice' => __DIR__.'/../view/layout/_noscript-notice.phtml',
318
+            'layout/layout' => __DIR__.'/../view/layout/layout.phtml',
319
+            'error/404' => __DIR__.'/../view/error/404.phtml',
320
+            'error/403' => __DIR__.'/../view/error/403.phtml',
321
+            'error/index' => __DIR__.'/../view/error/index.phtml',
322
+            'main-navigation' => __DIR__.'/../view/partial/main-navigation.phtml',
323
+            'pagination-control' => __DIR__.'/../view/partial/pagination-control.phtml',
324
+            'core/loading-popup' => __DIR__.'/../view/partial/loading-popup.phtml',
325
+            'core/notifications' => __DIR__.'/../view/partial/notifications.phtml',
326
+            'form/core/buttons' => __DIR__.'/../view/form/buttons.phtml',
327
+            'core/social-buttons' => __DIR__.'/../view/partial/social-buttons.phtml',
328
+            'form/core/privacy' => __DIR__.'/../view/form/privacy.phtml',
329
+            'core/form/permissions-fieldset' => __DIR__.'/../view/form/permissions-fieldset.phtml',
330
+            'core/form/permissions-collection' => __DIR__.'/../view/form/permissions-collection.phtml',
331
+            'core/form/container-view' => __DIR__.'/../view/form/container.view.phtml',
332
+            'core/form/tree-manage.view' => __DIR__.'/../view/form/tree-manage.view.phtml',
333
+            'core/form/tree-manage.form' => __DIR__.'/../view/form/tree-manage.form.phtml',
334
+            'core/form/tree-add-item' => __DIR__.'/../view/form/tree-add-item.phtml',
335
+            'mail/header' =>  __DIR__.'/../view/mail/header.phtml',
336
+            'mail/footer' =>  __DIR__.'/../view/mail/footer.phtml',
337
+            'mail/footer.en' =>  __DIR__.'/../view/mail/footer.en.phtml',
338 338
             //'startpage' => __DIR__ . '/../view/layout/startpage.phtml',
339 339
         ],
340 340
         // Where to look for view templates not mapped above
341 341
         'template_path_stack' => [
342
-            __DIR__ . '/../view',
342
+            __DIR__.'/../view',
343 343
         ],
344 344
     ],
345 345
     'view_helpers' => [
Please login to merge, or discard this patch.
module/Core/src/Core/Entity/Hydrator/ImageSetHydrator.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -86,7 +86,7 @@  discard block
 block discarded – undo
86 86
         $imageSpecs = $this->options->getImages();
87 87
 
88 88
 
89
-        $images = [ ImageSetInterface::ORIGINAL => $this->createEntity($file, $data) ];
89
+        $images = [ImageSetInterface::ORIGINAL => $this->createEntity($file, $data)];
90 90
 
91 91
         foreach ($imageSpecs as $key => $size) {
92 92
             $newImage = ImageSetInterface::THUMBNAIL == $key
@@ -94,7 +94,7 @@  discard block
 block discarded – undo
94 94
                 : $this->createImage($image, $size);
95 95
 
96 96
             if ($newImage) {
97
-                $entity   = $this->createEntity($newImage, $data, $key);
97
+                $entity = $this->createEntity($newImage, $data, $key);
98 98
                 $images[$key] = $entity;
99 99
             }
100 100
         }
@@ -142,7 +142,7 @@  discard block
 block discarded – undo
142 142
 
143 143
         $entity
144 144
             ->setFile($file)
145
-            ->setName(($prefix ? "$prefix-" : '') . $data['name'])
145
+            ->setName(($prefix ? "$prefix-" : '').$data['name'])
146 146
             ->setType($data['type'])
147 147
         ;
148 148
 
Please login to merge, or discard this patch.
module/Core/src/Core/Options/ImageSetOptions.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -43,7 +43,7 @@
 block discarded – undo
43 43
      * @var array
44 44
      */
45 45
     protected $images = [
46
-        ImageSetInterface::THUMBNAIL => [100,100],
46
+        ImageSetInterface::THUMBNAIL => [100, 100],
47 47
     ];
48 48
 
49 49
     /**
Please login to merge, or discard this patch.
module/Core/src/Core/Factory/Service/ImagineFactory.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -46,7 +46,7 @@
 block discarded – undo
46 46
             case ImagineOptions::LIB_GD:
47 47
             case ImagineOptions::LIB_IMAGICK:
48 48
             case ImagineOptions::LIB_GMAGICK:
49
-                $imagineClass = '\Imagine\\' . $lib . '\Imagine';
49
+                $imagineClass = '\Imagine\\'.$lib.'\Imagine';
50 50
                 $imagine = new $imagineClass;
51 51
                 break;
52 52
         }
Please login to merge, or discard this patch.
module/Organizations/config/module.config.php 2 patches
Indentation   +26 added lines, -26 removed lines patch added patch discarded remove patch
@@ -68,13 +68,13 @@  discard block
 block discarded – undo
68 68
     'view_manager' => [
69 69
         // Map template to files. Speeds up the lookup through the template stack.
70 70
         'template_map' => [
71
-             'organizations/index/edit' => __DIR__ . '/../view/organizations/index/form.phtml',
72
-             'organizations/form/employees-fieldset' => __DIR__ . '/../view/form/employees-fieldset.phtml',
73
-             'organizations/form/employee-fieldset' => __DIR__ .'/../view/form/employee-fieldset.phtml',
74
-             'organizations/form/invite-employee-bar' => __DIR__ . '/../view/form/invite-employee-bar.phtml',
75
-             'organizations/error/no-parent' => __DIR__ . '/../view/error/no-parent.phtml',
76
-             'organizations/error/invite' => __DIR__ . '/../view/error/invite.phtml',
77
-             'organizations/mail/invite-employee' => __DIR__ . '/../view/mail/invite-employee.phtml',
71
+                'organizations/index/edit' => __DIR__ . '/../view/organizations/index/form.phtml',
72
+                'organizations/form/employees-fieldset' => __DIR__ . '/../view/form/employees-fieldset.phtml',
73
+                'organizations/form/employee-fieldset' => __DIR__ .'/../view/form/employee-fieldset.phtml',
74
+                'organizations/form/invite-employee-bar' => __DIR__ . '/../view/form/invite-employee-bar.phtml',
75
+                'organizations/error/no-parent' => __DIR__ . '/../view/error/no-parent.phtml',
76
+                'organizations/error/invite' => __DIR__ . '/../view/error/invite.phtml',
77
+                'organizations/mail/invite-employee' => __DIR__ . '/../view/mail/invite-employee.phtml',
78 78
             'organizations/form/workflow-fieldset' => __DIR__ . '/../view/form/workflow-fieldset.phtml',
79 79
         ],
80 80
         // Where to look for view templates not mapped above
@@ -84,20 +84,20 @@  discard block
 block discarded – undo
84 84
     ],
85 85
     'form_elements' => [
86 86
         'invokables' => [
87
-             'Organizations/form' => 'Organizations\Form\Organizations',
88
-             'Organizations/OrganizationsContactForm'     => 'Organizations\Form\OrganizationsContactForm',
89
-             'Organizations/OrganizationsNameForm'        => 'Organizations\Form\OrganizationsNameForm',
90
-             'Organizations/OrganizationsDescriptionForm' => 'Organizations\Form\OrganizationsDescriptionForm',
91
-             'Organizations/OrganizationsContactFieldset' => 'Organizations\Form\OrganizationsContactFieldset',
92
-             'Organizations/OrganizationsNameFieldset'    => 'Organizations\Form\OrganizationsNameFieldset',
93
-             'Organizations/OrganizationsDescriptionFieldset' => 'Organizations\Form\OrganizationsDescriptionFieldset',
94
-             //'Organizations/OrganizationFieldset'       => 'Organizations\Form\OrganizationFieldset',
95
-             'Organizations/EmployeesContainer'           => 'Organizations\Form\EmployeesContainer',
96
-             'Organizations/Employees'                    => 'Organizations\Form\Employees',
97
-             'Organizations/InviteEmployeeBar'            => 'Organizations\Form\Element\InviteEmployeeBar',
98
-             'Organizations/Employee'                     => 'Organizations\Form\Element\Employee',
99
-             'Organizations/WorkflowSettings'             => 'Organizations\Form\WorkflowSettings',
100
-             'Organizations/WorkflowSettingsFieldset'     => 'Organizations\Form\WorkflowSettingsFieldset',
87
+                'Organizations/form' => 'Organizations\Form\Organizations',
88
+                'Organizations/OrganizationsContactForm'     => 'Organizations\Form\OrganizationsContactForm',
89
+                'Organizations/OrganizationsNameForm'        => 'Organizations\Form\OrganizationsNameForm',
90
+                'Organizations/OrganizationsDescriptionForm' => 'Organizations\Form\OrganizationsDescriptionForm',
91
+                'Organizations/OrganizationsContactFieldset' => 'Organizations\Form\OrganizationsContactFieldset',
92
+                'Organizations/OrganizationsNameFieldset'    => 'Organizations\Form\OrganizationsNameFieldset',
93
+                'Organizations/OrganizationsDescriptionFieldset' => 'Organizations\Form\OrganizationsDescriptionFieldset',
94
+                //'Organizations/OrganizationFieldset'       => 'Organizations\Form\OrganizationFieldset',
95
+                'Organizations/EmployeesContainer'           => 'Organizations\Form\EmployeesContainer',
96
+                'Organizations/Employees'                    => 'Organizations\Form\Employees',
97
+                'Organizations/InviteEmployeeBar'            => 'Organizations\Form\Element\InviteEmployeeBar',
98
+                'Organizations/Employee'                     => 'Organizations\Form\Element\Employee',
99
+                'Organizations/WorkflowSettings'             => 'Organizations\Form\WorkflowSettings',
100
+                'Organizations/WorkflowSettingsFieldset'     => 'Organizations\Form\WorkflowSettingsFieldset',
101 101
 
102 102
         ],
103 103
         'factories' => [
@@ -197,13 +197,13 @@  discard block
 block discarded – undo
197 197
 
198 198
     'service_manager' => [
199 199
         'invokables' => [
200
-           'Organizations\Auth\Dependency\EmployeeListListener' => 'Organizations\Auth\Dependency\EmployeeListListener'
200
+            'Organizations\Auth\Dependency\EmployeeListListener' => 'Organizations\Auth\Dependency\EmployeeListListener'
201 201
         ],
202 202
         'factories' => [
203
-           'Organizations\Auth\Dependency\ListListener' => 'Organizations\Factory\Auth\Dependency\ListListenerFactory',
204
-           'Organizations\ImageFileCache\Manager' => 'Organizations\Factory\ImageFileCache\ManagerFactory',
205
-           'Organizations\ImageFileCache\ODMListener' => 'Organizations\Factory\ImageFileCache\ODMListenerFactory',
206
-           'Organizations\ImageFileCache\ApplicationListener' => 'Organizations\Factory\ImageFileCache\ApplicationListenerFactory',
203
+            'Organizations\Auth\Dependency\ListListener' => 'Organizations\Factory\Auth\Dependency\ListListenerFactory',
204
+            'Organizations\ImageFileCache\Manager' => 'Organizations\Factory\ImageFileCache\ManagerFactory',
205
+            'Organizations\ImageFileCache\ODMListener' => 'Organizations\Factory\ImageFileCache\ODMListenerFactory',
206
+            'Organizations\ImageFileCache\ApplicationListener' => 'Organizations\Factory\ImageFileCache\ApplicationListenerFactory',
207 207
         ],
208 208
     ],
209 209
 
Please login to merge, or discard this patch.
Spacing   +16 added lines, -16 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
         ],
@@ -68,18 +68,18 @@  discard block
 block discarded – undo
68 68
     'view_manager' => [
69 69
         // Map template to files. Speeds up the lookup through the template stack.
70 70
         'template_map' => [
71
-             'organizations/index/edit' => __DIR__ . '/../view/organizations/index/form.phtml',
72
-             'organizations/form/employees-fieldset' => __DIR__ . '/../view/form/employees-fieldset.phtml',
73
-             'organizations/form/employee-fieldset' => __DIR__ .'/../view/form/employee-fieldset.phtml',
74
-             'organizations/form/invite-employee-bar' => __DIR__ . '/../view/form/invite-employee-bar.phtml',
75
-             'organizations/error/no-parent' => __DIR__ . '/../view/error/no-parent.phtml',
76
-             'organizations/error/invite' => __DIR__ . '/../view/error/invite.phtml',
77
-             'organizations/mail/invite-employee' => __DIR__ . '/../view/mail/invite-employee.phtml',
78
-            'organizations/form/workflow-fieldset' => __DIR__ . '/../view/form/workflow-fieldset.phtml',
71
+             'organizations/index/edit' => __DIR__.'/../view/organizations/index/form.phtml',
72
+             'organizations/form/employees-fieldset' => __DIR__.'/../view/form/employees-fieldset.phtml',
73
+             'organizations/form/employee-fieldset' => __DIR__.'/../view/form/employee-fieldset.phtml',
74
+             'organizations/form/invite-employee-bar' => __DIR__.'/../view/form/invite-employee-bar.phtml',
75
+             'organizations/error/no-parent' => __DIR__.'/../view/error/no-parent.phtml',
76
+             'organizations/error/invite' => __DIR__.'/../view/error/invite.phtml',
77
+             'organizations/mail/invite-employee' => __DIR__.'/../view/mail/invite-employee.phtml',
78
+            'organizations/form/workflow-fieldset' => __DIR__.'/../view/form/workflow-fieldset.phtml',
79 79
         ],
80 80
         // Where to look for view templates not mapped above
81 81
         'template_path_stack' => [
82
-            __DIR__ . '/../view',
82
+            __DIR__.'/../view',
83 83
         ],
84 84
     ],
85 85
     'form_elements' => [
@@ -149,11 +149,11 @@  discard block
 block discarded – undo
149 149
                 'allow' => [
150 150
                     'Entity/OrganizationImage',
151 151
                     'route/lang/organizations/invite',
152
-                    'Organizations/InviteEmployee' => [ 'accept' ],
152
+                    'Organizations/InviteEmployee' => ['accept'],
153 153
                 ],
154 154
                 'deny' => [
155 155
                     'route/lang/organizations',
156
-                    'Organizations/InviteEmployee' => [ 'invite' ],
156
+                    'Organizations/InviteEmployee' => ['invite'],
157 157
                 ],
158 158
             ],
159 159
             // recruiters are allowed to view their companies
@@ -161,7 +161,7 @@  discard block
 block discarded – undo
161 161
                 'allow' => [
162 162
                     'route/lang/organizations',
163 163
                     'Organizations/InviteEmployee',
164
-                    'Entity/Organization' => [ 'edit' => 'Organizations/Write' ],
164
+                    'Entity/Organization' => ['edit' => 'Organizations/Write'],
165 165
                 ],
166 166
             ],
167 167
         ],
@@ -177,8 +177,8 @@  discard block
 block discarded – undo
177 177
             'organizations' => [
178 178
                 'label' => 'Organizations',
179 179
                 'route' => 'lang/organizations',
180
-                'order' => 65,                             // allows to order the menu items
181
-                'resource' => 'route/lang/organizations',  // if a resource is defined, the acl will be applied.
180
+                'order' => 65, // allows to order the menu items
181
+                'resource' => 'route/lang/organizations', // if a resource is defined, the acl will be applied.
182 182
 
183 183
                 'pages' => [
184 184
                     'list' => [
Please login to merge, or discard this patch.