Completed
Push — develop ( 037ef6...a650ad )
by Carsten
06:58
created
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/Cv/src/Cv/Entity/ContactImage.php 2 patches
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -33,7 +33,7 @@
 block discarded – undo
33 33
      */
34 34
     public function getUri()
35 35
     {
36
-        return "/file/Cv.ContactImage/" . $this->id . "/" .urlencode($this->name);
36
+        return "/file/Cv.ContactImage/".$this->id."/".urlencode($this->name);
37 37
     }
38 38
     
39 39
     /**
Please login to merge, or discard this patch.
Indentation   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -44,16 +44,16 @@
 block discarded – undo
44 44
         $this->contact->setImage(null);
45 45
     }
46 46
     
47
-	/**
48
-	 * @param Contact $contact
49
-	 * @return ContactImage
50
-	 */
51
-	public function setContact(Contact $contact)
52
-	{
53
-		$this->contact = $contact;
47
+    /**
48
+     * @param Contact $contact
49
+     * @return ContactImage
50
+     */
51
+    public function setContact(Contact $contact)
52
+    {
53
+        $this->contact = $contact;
54 54
 		
55
-		return $this;
56
-	}
55
+        return $this;
56
+    }
57 57
 
58 58
     /**
59 59
      * @return Contact
Please login to merge, or discard this patch.
module/Applications/config/module.config.php 2 patches
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -23,7 +23,7 @@  discard block
 block discarded – undo
23 23
                 * for multiple paths.
24 24
                 * example https://github.com/doctrine/DoctrineORMModule
25 25
                 */
26
-               'paths' => array( __DIR__ . '/../src/Applications/Entity')
26
+               'paths' => array(__DIR__.'/../src/Applications/Entity')
27 27
             ),
28 28
         ),
29 29
         'eventmanager' => array(
@@ -138,7 +138,7 @@  discard block
 block discarded – undo
138 138
         'translation_file_patterns' => array(
139 139
             array(
140 140
                 'type' => 'gettext',
141
-                'base_dir' => __DIR__ . '/../language',
141
+                'base_dir' => __DIR__.'/../language',
142 142
                 'pattern' => '%s.mo',
143 143
             ),
144 144
         ),
@@ -146,16 +146,16 @@  discard block
 block discarded – undo
146 146
     // Configure the view service manager
147 147
     'view_manager' => array(
148 148
         'template_path_stack' => array(
149
-            'Applications' => __DIR__ . '/../view',
149
+            'Applications' => __DIR__.'/../view',
150 150
         ),
151 151
         'template_map' => array(
152
-            'applications/error/not-found' => __DIR__ . '/../view/error/not-found.phtml',
153
-            'layout/apply' => __DIR__ . '/../view/layout/layout.phtml',
154
-            'applications/sidebar/manage' => __DIR__ . '/../view/sidebar/manage.phtml',
155
-            'applications/mail/forward' => __DIR__ . '/../view/mail/forward.phtml',
156
-            'applications/detail/pdf' => __DIR__ . '/../view/applications/manage/detail.pdf.phtml',
157
-            'applications/index/disclaimer' => __DIR__ . '/../view/applications/index/disclaimer.phtml',
158
-            'content/applications-privacy-policy' => __DIR__ . '/../view/applications/index/disclaimer.phtml',
152
+            'applications/error/not-found' => __DIR__.'/../view/error/not-found.phtml',
153
+            'layout/apply' => __DIR__.'/../view/layout/layout.phtml',
154
+            'applications/sidebar/manage' => __DIR__.'/../view/sidebar/manage.phtml',
155
+            'applications/mail/forward' => __DIR__.'/../view/mail/forward.phtml',
156
+            'applications/detail/pdf' => __DIR__.'/../view/applications/manage/detail.pdf.phtml',
157
+            'applications/index/disclaimer' => __DIR__.'/../view/applications/index/disclaimer.phtml',
158
+            'content/applications-privacy-policy' => __DIR__.'/../view/applications/index/disclaimer.phtml',
159 159
         )
160 160
     ),
161 161
     'view_helpers' => array(
Please login to merge, or discard this patch.
Indentation   +26 added lines, -26 removed lines patch added patch discarded remove patch
@@ -10,20 +10,20 @@  discard block
 block discarded – undo
10 10
 
11 11
 return array(
12 12
     'doctrine' => array(
13
-       'driver' => array(
13
+        'driver' => array(
14 14
             'odm_default' => array(
15 15
                 'drivers' => array(
16 16
                     'Applications\Entity' => 'annotation',
17 17
                 ),
18 18
             ),
19 19
             'annotation' => array(
20
-               /*
20
+                /*
21 21
                 * All drivers (except DriverChain) require paths to work on. You
22 22
                 * may set this value as a string (for a single path) or an array
23 23
                 * for multiple paths.
24 24
                 * example https://github.com/doctrine/DoctrineORMModule
25 25
                 */
26
-               'paths' => array( __DIR__ . '/../src/Applications/Entity')
26
+                'paths' => array( __DIR__ . '/../src/Applications/Entity')
27 27
             ),
28 28
         ),
29 29
         'eventmanager' => array(
@@ -63,16 +63,16 @@  discard block
 block discarded – undo
63 63
             'Applications/Options/ModuleOptions' => 'Applications\Options\ModuleOptions',
64 64
         ),
65 65
         'factories' => array(
66
-           'Applications/Options' => 'Applications\Factory\ModuleOptionsFactory',
67
-           'ApplicationRepository' => 'Applications\Repository\Service\ApplicationRepositoryFactory',
68
-           'ApplicationMapper' => 'Applications\Repository\Service\ApplicationMapperFactory',
69
-           'EducationMapper'   => 'Applications\Repository\Service\EducationMapperFactory',
70
-           'Applications/Listener/ApplicationCreated' => 'Applications\Factory\Listener\EventApplicationCreatedFactory',
71
-           'Applications/Listener/ApplicationStatusChangePre' => 'Applications\Factory\Listener\StatusChangeFactory',
72
-           'Applications\Auth\Dependency\ListListener' => 'Applications\Factory\Auth\Dependency\ListListenerFactory'
66
+            'Applications/Options' => 'Applications\Factory\ModuleOptionsFactory',
67
+            'ApplicationRepository' => 'Applications\Repository\Service\ApplicationRepositoryFactory',
68
+            'ApplicationMapper' => 'Applications\Repository\Service\ApplicationMapperFactory',
69
+            'EducationMapper'   => 'Applications\Repository\Service\EducationMapperFactory',
70
+            'Applications/Listener/ApplicationCreated' => 'Applications\Factory\Listener\EventApplicationCreatedFactory',
71
+            'Applications/Listener/ApplicationStatusChangePre' => 'Applications\Factory\Listener\StatusChangeFactory',
72
+            'Applications\Auth\Dependency\ListListener' => 'Applications\Factory\Auth\Dependency\ListListenerFactory'
73 73
         ),
74 74
         'aliases' => [
75
-           'Applications/Listener/ApplicationStatusChangePost' => 'Applications/Listener/ApplicationStatusChangePre'
75
+            'Applications/Listener/ApplicationStatusChangePost' => 'Applications/Listener/ApplicationStatusChangePre'
76 76
         ]
77 77
     ),
78 78
     'controllers' => array(
@@ -170,25 +170,25 @@  discard block
 block discarded – undo
170 170
     ),
171 171
     'form_elements' => array(
172 172
         'invokables' => array(
173
-             'Applications/Mail' => 'Applications\Form\Mail',
174
-             'Applications/BaseFieldset' => 'Applications\Form\BaseFieldset',
175
-             'Applications/SettingsFieldset' => 'Applications\Form\SettingsFieldset',
176
-             'Applications/CommentForm' => 'Applications\Form\CommentForm',
177
-             'Applications/CommentFieldset' => 'Applications\Form\CommentFieldset',
178
-             'Applications/Apply' => 'Applications\Form\Apply',
179
-             'Applications/Contact' => 'Applications\Form\ContactContainer',
180
-             'Applications/Base'  => 'Applications\Form\Base',
181
-             'Applications/Facts' => 'Applications\Form\Facts',
182
-             'Applications/FactsFieldset' => 'Applications\Form\FactsFieldset',
183
-             'Applications/Attributes' => 'Applications\Form\Attributes',
184
-             'Applications/Filter' => 'Applications\Form\FilterApplication',
185
-             'href' => 'Applications\Form\Element\Ref',
186
-         ),
173
+                'Applications/Mail' => 'Applications\Form\Mail',
174
+                'Applications/BaseFieldset' => 'Applications\Form\BaseFieldset',
175
+                'Applications/SettingsFieldset' => 'Applications\Form\SettingsFieldset',
176
+                'Applications/CommentForm' => 'Applications\Form\CommentForm',
177
+                'Applications/CommentFieldset' => 'Applications\Form\CommentFieldset',
178
+                'Applications/Apply' => 'Applications\Form\Apply',
179
+                'Applications/Contact' => 'Applications\Form\ContactContainer',
180
+                'Applications/Base'  => 'Applications\Form\Base',
181
+                'Applications/Facts' => 'Applications\Form\Facts',
182
+                'Applications/FactsFieldset' => 'Applications\Form\FactsFieldset',
183
+                'Applications/Attributes' => 'Applications\Form\Attributes',
184
+                'Applications/Filter' => 'Applications\Form\FilterApplication',
185
+                'href' => 'Applications\Form\Element\Ref',
186
+            ),
187 187
         'factories' => array(
188 188
             'Applications/ContactImage' => 'Applications\Factory\Form\ContactImageFactory',
189 189
             'Applications/Attachments' => 'Applications\Factory\Form\AttachmentsFactory',
190 190
         ),
191
-     ),
191
+        ),
192 192
 
193 193
     'form_elements_config' => array(
194 194
         'Applications/Apply' => array(
Please login to merge, or discard this patch.
module/Core/src/Core/Form/View/Helper/FormCollectionContainer.php 3 patches
Braces   +3 added lines, -1 removed lines patch added patch discarded remove patch
@@ -60,10 +60,12 @@
 block discarded – undo
60 60
             %s
61 61
         </div>';
62 62
         
63
-        foreach ($container as $form) /* @var $form \Zend\Form\Form */
63
+        foreach ($container as $form) {
64
+            /* @var $form \Zend\Form\Form */
64 65
         {
65 66
             $formsMarkup .= sprintf($formTemplateWrapper, $formContainerHelper->renderElement($form, $layout, $parameter));
66 67
         }
68
+        }
67 69
         
68 70
         $templateForm = $container->getTemplateForm();
69 71
 		$templateMarkup = sprintf(
Please login to merge, or discard this patch.
Indentation   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -60,7 +60,7 @@  discard block
 block discarded – undo
60 60
         $translator = $this->getTranslator();
61 61
         $formContainerHelper = $view->formContainer();
62 62
         $formsMarkup = '';
63
-		$formTemplateWrapper = '<div class="form-collection-container-form">
63
+        $formTemplateWrapper = '<div class="form-collection-container-form">
64 64
             '. ($this->displayRemoveButton ? '<button type="button" class="btn btn-sm btn-danger pull-right form-collection-container-remove-button">' . $translator->translate('Remove') . '</button>' : '') . '
65 65
             %s
66 66
         </div>';
@@ -71,16 +71,16 @@  discard block
 block discarded – undo
71 71
         }
72 72
         
73 73
         $templateForm = $container->getTemplateForm();
74
-		$templateMarkup = sprintf(
74
+        $templateMarkup = sprintf(
75 75
             $view->formCollection()->getTemplateWrapper(),
76 76
             $view->escapeHtmlAttr(sprintf($formTemplateWrapper, $formContainerHelper->renderElement($templateForm, $layout, $parameter)))
77 77
         );
78 78
         
79
-		return sprintf('<div class="form-collection-container" data-new-entry-key="%s" data-remove-action="%s" data-remove-question="%s">
79
+        return sprintf('<div class="form-collection-container" data-new-entry-key="%s" data-remove-action="%s" data-remove-question="%s">
80 80
                 <h3>%s</h3>
81 81
                 %s%s%s
82 82
             </div>',
83
-		    CollectionContainer::NEW_ENTRY,
83
+            CollectionContainer::NEW_ENTRY,
84 84
             $container->formatAction('remove'),
85 85
             $translator->translate('Really remove?'),
86 86
             $container->getLabel(),
@@ -90,14 +90,14 @@  discard block
 block discarded – undo
90 90
         );
91 91
     }
92 92
     /**
93
-	 * @param boolean $displayRemoveButton
94
-	 * @return FormCollectionContainer
93
+     * @param boolean $displayRemoveButton
94
+     * @return FormCollectionContainer
95 95
      * @since 0.26
96
-	 */
97
-	public function setDisplayRemoveButton($displayRemoveButton)
98
-	{
99
-		$this->displayRemoveButton = (bool)$displayRemoveButton;
96
+     */
97
+    public function setDisplayRemoveButton($displayRemoveButton)
98
+    {
99
+        $this->displayRemoveButton = (bool)$displayRemoveButton;
100 100
 		
101
-		return $this;
102
-	}
101
+        return $this;
102
+    }
103 103
 }
Please login to merge, or discard this patch.
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -61,7 +61,7 @@  discard block
 block discarded – undo
61 61
         $formContainerHelper = $view->formContainer();
62 62
         $formsMarkup = '';
63 63
 		$formTemplateWrapper = '<div class="form-collection-container-form">
64
-            '. ($this->displayRemoveButton ? '<button type="button" class="btn btn-sm btn-danger pull-right form-collection-container-remove-button">' . $translator->translate('Remove') . '</button>' : '') . '
64
+            '. ($this->displayRemoveButton ? '<button type="button" class="btn btn-sm btn-danger pull-right form-collection-container-remove-button">'.$translator->translate('Remove').'</button>' : '').'
65 65
             %s
66 66
         </div>';
67 67
         
@@ -86,7 +86,7 @@  discard block
 block discarded – undo
86 86
             $container->getLabel(),
87 87
             $formsMarkup,
88 88
             $templateMarkup,
89
-            '<div class="form-collection-container-add-wrapper"><button type="button" class="btn btn-success form-collection-container-add-button"><span class="yk-icon yk-icon-plus"></span> ' . sprintf($translator->translate('Add %s'), $container->getLabel()) . '</button></div>'
89
+            '<div class="form-collection-container-add-wrapper"><button type="button" class="btn btn-success form-collection-container-add-button"><span class="yk-icon yk-icon-plus"></span> '.sprintf($translator->translate('Add %s'), $container->getLabel()).'</button></div>'
90 90
         );
91 91
     }
92 92
     /**
@@ -96,7 +96,7 @@  discard block
 block discarded – undo
96 96
 	 */
97 97
 	public function setDisplayRemoveButton($displayRemoveButton)
98 98
 	{
99
-		$this->displayRemoveButton = (bool)$displayRemoveButton;
99
+		$this->displayRemoveButton = (bool) $displayRemoveButton;
100 100
 		
101 101
 		return $this;
102 102
 	}
Please login to merge, or discard this patch.
module/Cv/src/Cv/Form/PreferredJobForm.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -11,7 +11,7 @@
 block discarded – undo
11 11
 
12 12
     public function init()
13 13
     {
14
-      //  $this->setDescription(/*@translate*/' Where do you want to work tomorrow. This heading gives an immediate overview of your desired next job.');
14
+        //  $this->setDescription(/*@translate*/' Where do you want to work tomorrow. This heading gives an immediate overview of your desired next job.');
15 15
         $this->setIsDescriptionsEnabled(true);
16 16
         parent::init();
17 17
     }
Please login to merge, or discard this patch.
module/Cv/src/Cv/Form/NativeLanguageFieldset.php 1 patch
Indentation   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -124,9 +124,9 @@
 block discarded – undo
124 124
     public function init()
125 125
     {
126 126
         $this->setName('nativeLanguages')
127
-             ->setHydrator(new EntityHydrator())
128
-             ->setObject(new NativeLanguageEntity())
129
-             ->setLabel('Native Language');
127
+                ->setHydrator(new EntityHydrator())
128
+                ->setObject(new NativeLanguageEntity())
129
+                ->setLabel('Native Language');
130 130
 
131 131
 
132 132
         $this->add(
Please login to merge, or discard this patch.
module/Cv/src/Cv/Entity/Cv.php 3 patches
Indentation   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -60,11 +60,11 @@
 block discarded – undo
60 60
     protected $skills;
61 61
 
62 62
     /**
63
-    * Skills
64
-    *
65
-    * @var ArrayCollection
66
-    * @ODM\EmbedMany(targetDocument="\Cv\Entity\Language")
67
-    */
63
+     * Skills
64
+     *
65
+     * @var ArrayCollection
66
+     * @ODM\EmbedMany(targetDocument="\Cv\Entity\Language")
67
+     */
68 68
     protected $languageSkills;
69 69
 
70 70
     /**
Please login to merge, or discard this patch.
Doc Comments   +8 added lines, -5 removed lines patch added patch discarded remove patch
@@ -186,7 +186,7 @@  discard block
 block discarded – undo
186 186
     }
187 187
     
188 188
     /**
189
-     * @return ArrayCollection
189
+     * @return IdentityWrapper
190 190
      */
191 191
     public function getEducationsIndexedById()
192 192
     {
@@ -215,7 +215,7 @@  discard block
 block discarded – undo
215 215
     }
216 216
     
217 217
     /**
218
-     * @return ArrayCollection
218
+     * @return IdentityWrapper
219 219
      */
220 220
     public function getEmploymentsIndexedById()
221 221
     {
@@ -244,7 +244,7 @@  discard block
 block discarded – undo
244 244
     }
245 245
     
246 246
     /**
247
-     * @return ArrayCollection
247
+     * @return IdentityWrapper
248 248
      */
249 249
     public function getSkillsIndexedById()
250 250
     {
@@ -322,7 +322,7 @@  discard block
 block discarded – undo
322 322
     }
323 323
 
324 324
     /**
325
-     * @return ArrayCollection
325
+     * @return IdentityWrapper
326 326
      */
327 327
     public function getLanguageSkillsIndexedById()
328 328
     {
@@ -360,7 +360,7 @@  discard block
 block discarded – undo
360 360
     }
361 361
     
362 362
     /**
363
-     * @param Status|string $status
363
+     * @param string $status
364 364
      */
365 365
     public function setStatus($status)
366 366
     {
@@ -407,6 +407,9 @@  discard block
 block discarded – undo
407 407
         }
408 408
     }
409 409
 
410
+    /**
411
+     * @param UserInterface $oldUser
412
+     */
410 413
     private function updatePermissions($oldUser = null)
411 414
     {
412 415
         $hasPermissions = (bool) $this->permissions;
Please login to merge, or discard this patch.
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -82,7 +82,7 @@  discard block
 block discarded – undo
82 82
      * @var array
83 83
      * @ODM\Collection
84 84
      */
85
-    protected $nativeLanguages=[];
85
+    protected $nativeLanguages = [];
86 86
 
87 87
 
88 88
     /**
@@ -267,7 +267,7 @@  discard block
 block discarded – undo
267 267
      */
268 268
     public function setIsDraft($isDraft)
269 269
     {
270
-        $this->isDraft=$isDraft;
270
+        $this->isDraft = $isDraft;
271 271
         return $this;
272 272
     }
273 273
 
@@ -337,7 +337,7 @@  discard block
 block discarded – undo
337 337
      */
338 338
     public function setNativeLanguages($nativeLanguages)
339 339
     {
340
-        $this->nativeLanguages=$nativeLanguages;
340
+        $this->nativeLanguages = $nativeLanguages;
341 341
         return $this;
342 342
     }
343 343
 
Please login to merge, or discard this patch.
module/Cv/src/Cv/Form/LanguageSkillFieldset.php 1 patch
Indentation   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -11,9 +11,9 @@
 block discarded – undo
11 11
     public function init()
12 12
     {
13 13
         $this->setName('language')
14
-             ->setHydrator(new EntityHydrator())
15
-             ->setObject(new LanguageEntity())
16
-             ->setLabel('Language');
14
+                ->setHydrator(new EntityHydrator())
15
+                ->setObject(new LanguageEntity())
16
+                ->setLabel('Language');
17 17
         
18 18
         $this->add(
19 19
             array(
Please login to merge, or discard this patch.
module/Core/src/Core/Entity/LocationInterface.php 1 patch
Doc Comments   +7 added lines, -6 removed lines patch added patch discarded remove patch
@@ -20,14 +20,14 @@  discard block
 block discarded – undo
20 20
      * Sets the Postal Code of a location
21 21
      *
22 22
      * @param   string $postalCode
23
-     * @return mixed
23
+     * @return AbstractLocation
24 24
      */
25 25
     public function setPostalCode($postalCode);
26 26
 
27 27
     /**
28 28
      * Gets the Postal Code of a location
29 29
      *
30
-     * @return mixed
30
+     * @return string
31 31
      */
32 32
     public function getPostalCode();
33 33
 
@@ -44,6 +44,7 @@  discard block
 block discarded – undo
44 44
      *
45 45
      * @param GeoJson $coordinates
46 46
      * @internal param $point
47
+     * @return AbstractLocation
47 48
      */
48 49
     public function setCoordinates(GeoJson $coordinates);
49 50
 
@@ -51,7 +52,7 @@  discard block
 block discarded – undo
51 52
      * Sets the city name of a Location
52 53
      *
53 54
      * @param $city
54
-     * @return mixed
55
+     * @return AbstractLocation
55 56
      */
56 57
     public function setCity($city);
57 58
 
@@ -66,14 +67,14 @@  discard block
 block discarded – undo
66 67
      * Sets the country of a location
67 68
      *
68 69
      * @param $country
69
-     * @return mixed
70
+     * @return AbstractLocation
70 71
      */
71 72
     public function setCountry($country);
72 73
 
73 74
     /**
74 75
      * Gets the country of a location
75 76
      *
76
-     * @return mixed
77
+     * @return string
77 78
      */
78 79
     public function getCountry();
79 80
 
@@ -81,7 +82,7 @@  discard block
 block discarded – undo
81 82
      * Sets the region of a location. Eg. "Hessen" is a region in "Germany"
82 83
      *
83 84
      * @param $region
84
-     * @return mixed
85
+     * @return AbstractLocation
85 86
      */
86 87
     public function setRegion($region);
87 88
 
Please login to merge, or discard this patch.