Completed
Pull Request — develop (#245)
by ANTHONIUS
08:30
created
module/Core/config/module.config.php 2 patches
Indentation   +19 added lines, -19 removed lines patch added patch discarded remove patch
@@ -32,24 +32,24 @@  discard block
 block discarded – undo
32 32
     'log' => array(
33 33
         'Core/Log' => array(
34 34
             'writers' => array(
35
-                 array(
36
-                     'name' => 'stream',
35
+                    array(
36
+                        'name' => 'stream',
37 37
                     'priority' => 1000,
38 38
                     'options' => array(
39
-                         'stream' => __DIR__ .'/../../../log/yawik.log',
39
+                            'stream' => __DIR__ .'/../../../log/yawik.log',
40
+                    ),
40 41
                     ),
41
-                 ),
42 42
             ),
43 43
         ),
44 44
         'Log/Core/Mail' => array(
45 45
             'writers' => array(
46
-                 array(
47
-                     'name' => 'stream',
46
+                    array(
47
+                        'name' => 'stream',
48 48
                     'priority' => 1000,
49 49
                     'options' => array(
50
-                         'stream' => __DIR__ .'/../../../log/mails.log',
50
+                            'stream' => __DIR__ .'/../../../log/mails.log',
51
+                    ),
51 52
                     ),
52
-                 ),
53 53
             ),
54 54
         ),
55 55
         'ErrorLogger' => array(
@@ -234,17 +234,17 @@  discard block
 block discarded – undo
234 234
     // Defines the Core/Navigation.
235 235
     'navigation' => array(
236 236
         'default' => array(
237
-             'home' => array(
238
-                 'label' => /*@translate*/ 'Home',
239
-                 'route' => 'lang',
240
-                 'visible' => false
241
-             ),
242
-             'admin' => array(
243
-                 'label ' => /*@translate*/ 'Admin',
244
-                 'route' => 'lang/admin',
245
-                 'resource' => 'route/lang/admin',
246
-                 'order' => 200,
247
-             ),
237
+                'home' => array(
238
+                    'label' => /*@translate*/ 'Home',
239
+                    'route' => 'lang',
240
+                    'visible' => false
241
+                ),
242
+                'admin' => array(
243
+                    'label ' => /*@translate*/ 'Admin',
244
+                    'route' => 'lang/admin',
245
+                    'resource' => 'route/lang/admin',
246
+                    'order' => 200,
247
+                ),
248 248
         ),
249 249
     ),
250 250
     // Configuration of the controller service manager (Which loads controllers)
Please login to merge, or discard this patch.
Spacing   +26 added lines, -26 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 array(
@@ -36,7 +36,7 @@  discard block
 block discarded – undo
36 36
                      'name' => 'stream',
37 37
                     'priority' => 1000,
38 38
                     'options' => array(
39
-                         'stream' => __DIR__ .'/../../../log/yawik.log',
39
+                         'stream' => __DIR__.'/../../../log/yawik.log',
40 40
                     ),
41 41
                  ),
42 42
             ),
@@ -47,7 +47,7 @@  discard block
 block discarded – undo
47 47
                      'name' => 'stream',
48 48
                     'priority' => 1000,
49 49
                     'options' => array(
50
-                         'stream' => __DIR__ .'/../../../log/mails.log',
50
+                         'stream' => __DIR__.'/../../../log/mails.log',
51 51
                     ),
52 52
                  ),
53 53
             ),
@@ -55,7 +55,7 @@  discard block
 block discarded – undo
55 55
         'ErrorLogger' => array(
56 56
             'service' => 'Core/ErrorLogger',
57 57
             'config'  => array(
58
-                'stream' => __DIR__ . '/../../../log/error.log',
58
+                'stream' => __DIR__.'/../../../log/error.log',
59 59
                 'log_errors' => true,
60 60
                 'log_exceptions' => true,
61 61
             ),
@@ -216,17 +216,17 @@  discard block
 block discarded – undo
216 216
         'translation_file_patterns' => array(
217 217
             [
218 218
                 'type' => 'gettext',
219
-                'base_dir' => __DIR__ . '/../language',
219
+                'base_dir' => __DIR__.'/../language',
220 220
                 'pattern' => '%s.mo',
221 221
             ],
222 222
             [
223 223
                 'type'     => 'phparray',
224
-                'base_dir' => __DIR__ . '/../language',
224
+                'base_dir' => __DIR__.'/../language',
225 225
                 'pattern' => 'Zend_Validate.%s.php',
226 226
             ],
227 227
             [
228 228
                 'type'     => 'phparray',
229
-                'base_dir' => __DIR__ . '/../language',
229
+                'base_dir' => __DIR__.'/../language',
230 230
                 'pattern' => 'Zend_Captcha.%s.php',
231 231
             ]
232 232
         ),
@@ -291,29 +291,29 @@  discard block
 block discarded – undo
291 291
         'exception_template' => 'error/index',
292 292
         // Map template to files. Speeds up the lookup through the template stack.
293 293
         'template_map' => array(
294
-            'noscript-notice' => __DIR__ . '/../view/layout/_noscript-notice.phtml',
295
-            'layout/layout' => __DIR__ . '/../view/layout/layout.phtml',
296
-            'error/404' => __DIR__ . '/../view/error/404.phtml',
297
-            'error/403' => __DIR__ . '/../view/error/403.phtml',
298
-            'error/index' => __DIR__ . '/../view/error/index.phtml',
299
-            'main-navigation' => __DIR__ . '/../view/partial/main-navigation.phtml',
300
-            'pagination-control' => __DIR__ . '/../view/partial/pagination-control.phtml',
301
-            'core/loading-popup' => __DIR__ . '/../view/partial/loading-popup.phtml',
302
-            'core/notifications' => __DIR__ . '/../view/partial/notifications.phtml',
303
-            'form/core/buttons' => __DIR__ . '/../view/form/buttons.phtml',
304
-            'core/social-buttons' => __DIR__ . '/../view/partial/social-buttons.phtml',
305
-            'form/core/privacy' => __DIR__ . '/../view/form/privacy.phtml',
306
-            'core/form/permissions-fieldset' => __DIR__ . '/../view/form/permissions-fieldset.phtml',
307
-            'core/form/permissions-collection' => __DIR__ . '/../view/form/permissions-collection.phtml',
308
-            'core/form/container-view' => __DIR__ . '/../view/form/container.view.phtml',
309
-            'mail/header' =>  __DIR__ . '/../view/mail/header.phtml',
310
-            'mail/footer' =>  __DIR__ . '/../view/mail/footer.phtml',
311
-            'mail/footer.en' =>  __DIR__ . '/../view/mail/footer.en.phtml',
294
+            'noscript-notice' => __DIR__.'/../view/layout/_noscript-notice.phtml',
295
+            'layout/layout' => __DIR__.'/../view/layout/layout.phtml',
296
+            'error/404' => __DIR__.'/../view/error/404.phtml',
297
+            'error/403' => __DIR__.'/../view/error/403.phtml',
298
+            'error/index' => __DIR__.'/../view/error/index.phtml',
299
+            'main-navigation' => __DIR__.'/../view/partial/main-navigation.phtml',
300
+            'pagination-control' => __DIR__.'/../view/partial/pagination-control.phtml',
301
+            'core/loading-popup' => __DIR__.'/../view/partial/loading-popup.phtml',
302
+            'core/notifications' => __DIR__.'/../view/partial/notifications.phtml',
303
+            'form/core/buttons' => __DIR__.'/../view/form/buttons.phtml',
304
+            'core/social-buttons' => __DIR__.'/../view/partial/social-buttons.phtml',
305
+            'form/core/privacy' => __DIR__.'/../view/form/privacy.phtml',
306
+            'core/form/permissions-fieldset' => __DIR__.'/../view/form/permissions-fieldset.phtml',
307
+            'core/form/permissions-collection' => __DIR__.'/../view/form/permissions-collection.phtml',
308
+            'core/form/container-view' => __DIR__.'/../view/form/container.view.phtml',
309
+            'mail/header' =>  __DIR__.'/../view/mail/header.phtml',
310
+            'mail/footer' =>  __DIR__.'/../view/mail/footer.phtml',
311
+            'mail/footer.en' =>  __DIR__.'/../view/mail/footer.en.phtml',
312 312
             //'startpage' => __DIR__ . '/../view/layout/startpage.phtml',
313 313
         ),
314 314
         // Where to look for view templates not mapped above
315 315
         'template_path_stack' => array(
316
-            __DIR__ . '/../view',
316
+            __DIR__.'/../view',
317 317
         ),
318 318
     ),
319 319
     'view_helpers' => array(
Please login to merge, or discard this patch.
module/Core/src/Core/Entity/FileEntity.php 2 patches
Doc Comments   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -170,7 +170,7 @@  discard block
 block discarded – undo
170 170
     /**
171 171
      * Gets the mime-type of a file
172 172
      *
173
-     * @return mixed
173
+     * @return string|null
174 174
      */
175 175
     public function getType()
176 176
     {
@@ -192,7 +192,7 @@  discard block
 block discarded – undo
192 192
     /**
193 193
      * Gets the uploaded date of a file
194 194
      *
195
-     * @return mixed
195
+     * @return null|\DateTime
196 196
      */
197 197
     public function getDateUploaded()
198 198
     {
@@ -228,7 +228,7 @@  discard block
 block discarded – undo
228 228
     /**
229 229
      * Gets the length of the file
230 230
      *
231
-     * @return mixed
231
+     * @return string|null
232 232
      */
233 233
     public function getLength()
234 234
     {
Please login to merge, or discard this patch.
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -141,15 +141,15 @@
 block discarded – undo
141 141
         $size = $this->getLength();
142 142
         
143 143
         if ($size >= 1073741824) {
144
-            return round($size / 1073741824, 2) . ' GB';
144
+            return round($size / 1073741824, 2).' GB';
145 145
         }
146 146
         
147 147
         if ($size >= 1048576) {
148
-            return round($size / 1048576, 2) . ' MB';
148
+            return round($size / 1048576, 2).' MB';
149 149
         }
150 150
         
151 151
         if ($size >= 1024) {
152
-            return round($size / 1024, 2) . ' kB';
152
+            return round($size / 1024, 2).' kB';
153 153
         }
154 154
         
155 155
         return $size;
Please login to merge, or discard this patch.
module/Orders/src/Entity/InvoiceAddress.php 1 patch
Indentation   -1 removed lines patch added patch discarded remove patch
@@ -15,7 +15,6 @@
 block discarded – undo
15 15
 
16 16
 /**
17 17
  *
18
-
19 18
  */
20 19
 interface FileInterface extends
21 20
     IdentifiableEntityInterface,
Please login to merge, or discard this patch.
module/Cv/config/module.config.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -15,7 +15,7 @@  discard block
 block discarded – undo
15 15
                  * for multiple paths.
16 16
                  * example https://github.com/doctrine/DoctrineORMModule
17 17
                  */
18
-                'paths' => array( __DIR__ . '/../src/Cv/Entity'),
18
+                'paths' => array(__DIR__.'/../src/Cv/Entity'),
19 19
             ),
20 20
         ),
21 21
     ),
@@ -27,7 +27,7 @@  discard block
 block discarded – undo
27 27
         'translation_file_patterns' => array(
28 28
             array(
29 29
                 'type'     => 'gettext',
30
-                'base_dir' => __DIR__ . '/../language',
30
+                'base_dir' => __DIR__.'/../language',
31 31
                 'pattern'  => '%s.mo',
32 32
             ),
33 33
         ),
@@ -134,7 +134,7 @@  discard block
 block discarded – undo
134 134
     
135 135
         // Where to look for view templates not mapped above
136 136
         'template_path_stack' => array(
137
-            __DIR__ . '/../view',
137
+            __DIR__.'/../view',
138 138
         ),
139 139
     ),
140 140
     'filters' => array(
Please login to merge, or discard this patch.
module/Jobs/src/Jobs/Entity/TemplateValues.php 2 patches
Spacing   +14 added lines, -14 removed lines patch added patch discarded remove patch
@@ -35,7 +35,7 @@  discard block
 block discarded – undo
35 35
      * @var String
36 36
      * @ODM\Field(type="string")
37 37
      */
38
-    protected $qualifications='';
38
+    protected $qualifications = '';
39 39
 
40 40
     /**
41 41
      * Requirements field of the job template
@@ -43,7 +43,7 @@  discard block
 block discarded – undo
43 43
      * @var String
44 44
      * @ODM\Field(type="string")
45 45
      */
46
-    protected $requirements='';
46
+    protected $requirements = '';
47 47
 
48 48
     /**
49 49
      * Benefits field of the job template
@@ -51,7 +51,7 @@  discard block
 block discarded – undo
51 51
      * @var String
52 52
      * @ODM\Field(type="string")
53 53
      */
54
-    protected $benefits='';
54
+    protected $benefits = '';
55 55
 
56 56
     /**
57 57
      * Job title field of the job template
@@ -59,7 +59,7 @@  discard block
 block discarded – undo
59 59
      * @var String
60 60
      * @ODM\Field(type="string")
61 61
      */
62
-    protected $title='';
62
+    protected $title = '';
63 63
 
64 64
     /**
65 65
      * Company description field of the job template
@@ -67,7 +67,7 @@  discard block
 block discarded – undo
67 67
      * @var String
68 68
      * @ODM\Field(type="string")
69 69
      */
70
-    protected $description='';
70
+    protected $description = '';
71 71
 
72 72
     /**
73 73
      * language of the job template values. Must be a valid ISO 639-1 code
@@ -75,7 +75,7 @@  discard block
 block discarded – undo
75 75
      * @var String
76 76
      * @ODM\Field(type="string")
77 77
      */
78
-    protected $language='en';
78
+    protected $language = 'en';
79 79
 
80 80
     /**
81 81
      * free values (currently not in use)
@@ -92,7 +92,7 @@  discard block
 block discarded – undo
92 92
      */
93 93
     public function setQualifications($qualifications)
94 94
     {
95
-        $this->qualifications= (string) $qualifications;
95
+        $this->qualifications = (string) $qualifications;
96 96
         return $this;
97 97
     }
98 98
 
@@ -114,7 +114,7 @@  discard block
 block discarded – undo
114 114
      */
115 115
     public function setRequirements($requirements)
116 116
     {
117
-        $this->requirements=(string) $requirements;
117
+        $this->requirements = (string) $requirements;
118 118
         return $this;
119 119
     }
120 120
 
@@ -136,7 +136,7 @@  discard block
 block discarded – undo
136 136
      */
137 137
     public function setBenefits($benefits)
138 138
     {
139
-        $this->benefits=(string) $benefits;
139
+        $this->benefits = (string) $benefits;
140 140
         return $this;
141 141
     }
142 142
 
@@ -158,7 +158,7 @@  discard block
 block discarded – undo
158 158
      */
159 159
     public function setTitle($title)
160 160
     {
161
-        $this->title=(string) $title;
161
+        $this->title = (string) $title;
162 162
         return $this;
163 163
     }
164 164
 
@@ -180,7 +180,7 @@  discard block
 block discarded – undo
180 180
      */
181 181
     public function setDescription($description)
182 182
     {
183
-        $this->description=(string) $description;
183
+        $this->description = (string) $description;
184 184
         return $this;
185 185
     }
186 186
 
@@ -202,7 +202,7 @@  discard block
 block discarded – undo
202 202
      */
203 203
     public function setLanguage($language)
204 204
     {
205
-        $this->language=(string) $language;
205
+        $this->language = (string) $language;
206 206
         return $this;
207 207
     }
208 208
 
@@ -247,7 +247,7 @@  discard block
 block discarded – undo
247 247
 
248 248
     public function __get($property)
249 249
     {
250
-        $getter = "get" . ucfirst($property);
250
+        $getter = "get".ucfirst($property);
251 251
         if (method_exists($this, $getter)) {
252 252
             return $this->$getter();
253 253
         }
@@ -262,7 +262,7 @@  discard block
 block discarded – undo
262 262
     public function __set($property, $value)
263 263
     {
264 264
         //$this->checkWriteAccess();
265
-        $setter = 'set' . ucfirst($property);
265
+        $setter = 'set'.ucfirst($property);
266 266
         if (method_exists($this, $setter)) {
267 267
             $this->$setter($value);
268 268
             return;
Please login to merge, or discard this patch.
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -175,7 +175,7 @@
 block discarded – undo
175 175
     /**
176 176
      * Sets the company description of the job template
177 177
      *
178
-     * @param $description
178
+     * @param string $description
179 179
      * @return $this
180 180
      */
181 181
     public function setDescription($description)
Please login to merge, or discard this patch.
module/Jobs/src/Jobs/Entity/Status.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -52,12 +52,12 @@  discard block
 block discarded – undo
52 52
 
53 53
     public function __construct($status = self::CREATED)
54 54
     {
55
-        $constant = 'self::' . strtoupper($status);
55
+        $constant = 'self::'.strtoupper($status);
56 56
         if (!defined($constant)) {
57
-            throw new \DomainException('Unknown status: ' . $status);
57
+            throw new \DomainException('Unknown status: '.$status);
58 58
         }
59
-        $this->name=constant($constant);
60
-        $this->order=$this->getOrder();
59
+        $this->name = constant($constant);
60
+        $this->order = $this->getOrder();
61 61
     }
62 62
 
63 63
     /**
@@ -66,7 +66,7 @@  discard block
 block discarded – undo
66 66
      */
67 67
     public function getName()
68 68
     {
69
-        return isset($this->name)?$this->name:'';
69
+        return isset($this->name) ? $this->name : '';
70 70
     }
71 71
 
72 72
     /**
Please login to merge, or discard this patch.
module/Jobs/src/Jobs/View/Helper/ApplyUrl.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -63,7 +63,7 @@
 block discarded – undo
63 63
             $urlHelper = $this->urlHelper;
64 64
             $serverUrlHelper = $this->serverUrlHelper;
65 65
             $params = $this->paramsHelper;
66
-            $query = array('subscriberUri' => $serverUrlHelper(array()) . '/subscriber/' . 1);
66
+            $query = array('subscriberUri' => $serverUrlHelper(array()).'/subscriber/'.1);
67 67
             $route = 'lang/apply';
68 68
             $params = array('applyId' => $jobEntity->getApplyId(), 'lang' => $params('lang'));
69 69
             $url = $urlHelper($route, $params, array('query' => $query));
Please login to merge, or discard this patch.
module/Jobs/src/Jobs/Form/OrganizationSelect.php 2 patches
Indentation   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -64,10 +64,10 @@
 block discarded – undo
64 64
             $imageUrl = $image ? $image->getUri() : '';
65 65
 
66 66
             $options[$org->getId()] = $name . '|'
67
-                                      . $contact->getCity() . '|'
68
-                                      . $contact->getStreet() . '|'
69
-                                      . $contact->getHouseNumber() . '|'
70
-                                      . $imageUrl;
67
+                                        . $contact->getCity() . '|'
68
+                                        . $contact->getStreet() . '|'
69
+                                        . $contact->getHouseNumber() . '|'
70
+                                        . $imageUrl;
71 71
         }
72 72
 
73 73
         return $this->setValueOptions($options);
Please login to merge, or discard this patch.
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -63,10 +63,10 @@
 block discarded – undo
63 63
             $image    = $org->getImage();
64 64
             $imageUrl = $image ? $image->getUri() : '';
65 65
 
66
-            $options[$org->getId()] = $name . '|'
67
-                                      . $contact->getCity() . '|'
68
-                                      . $contact->getStreet() . '|'
69
-                                      . $contact->getHouseNumber() . '|'
66
+            $options[$org->getId()] = $name.'|'
67
+                                      . $contact->getCity().'|'
68
+                                      . $contact->getStreet().'|'
69
+                                      . $contact->getHouseNumber().'|'
70 70
                                       . $imageUrl;
71 71
         }
72 72
 
Please login to merge, or discard this patch.
module/Jobs/src/Jobs/Form/View/Helper/PreviewLink.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -35,7 +35,7 @@
 block discarded – undo
35 35
 
36 36
     public function render(ElementInterface $element, $options = null)
37 37
     {
38
-        $content = '<iframe src="' . $element->getValue() . '" name="preview" style="width:100%; height:800px;"></iframe>';
38
+        $content = '<iframe src="'.$element->getValue().'" name="preview" style="width:100%; height:800px;"></iframe>';
39 39
         return $content;
40 40
     }
41 41
 }
Please login to merge, or discard this patch.