Completed
Pull Request — develop (#228)
by ANTHONIUS
08:32
created
module/Applications/config/module.config.php 2 patches
Indentation   +25 added lines, -25 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,15 +63,15 @@  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'
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 72
         ),
73 73
         'aliases' => [
74
-           'Applications/Listener/ApplicationStatusChangePost' => 'Applications/Listener/ApplicationStatusChangePre'
74
+            'Applications/Listener/ApplicationStatusChangePost' => 'Applications/Listener/ApplicationStatusChangePre'
75 75
         ]
76 76
     ),
77 77
     'controllers' => array(
@@ -169,25 +169,25 @@  discard block
 block discarded – undo
169 169
     ),
170 170
     'form_elements' => array(
171 171
         'invokables' => array(
172
-             'Applications/Mail' => 'Applications\Form\Mail',
173
-             'Applications/BaseFieldset' => 'Applications\Form\BaseFieldset',
174
-             'Applications/SettingsFieldset' => 'Applications\Form\SettingsFieldset',
175
-             'Applications/CommentForm' => 'Applications\Form\CommentForm',
176
-             'Applications/CommentFieldset' => 'Applications\Form\CommentFieldset',
177
-             'Applications/Apply' => 'Applications\Form\Apply',
178
-             'Applications/Contact' => 'Applications\Form\ContactContainer',
179
-             'Applications/Base'  => 'Applications\Form\Base',
180
-             'Applications/Facts' => 'Applications\Form\Facts',
181
-             'Applications/FactsFieldset' => 'Applications\Form\FactsFieldset',
182
-             'Applications/Attributes' => 'Applications\Form\Attributes',
183
-             'Applications/Filter' => 'Applications\Form\FilterApplication',
184
-             'href' => 'Applications\Form\Element\Ref',
185
-         ),
172
+                'Applications/Mail' => 'Applications\Form\Mail',
173
+                'Applications/BaseFieldset' => 'Applications\Form\BaseFieldset',
174
+                'Applications/SettingsFieldset' => 'Applications\Form\SettingsFieldset',
175
+                'Applications/CommentForm' => 'Applications\Form\CommentForm',
176
+                'Applications/CommentFieldset' => 'Applications\Form\CommentFieldset',
177
+                'Applications/Apply' => 'Applications\Form\Apply',
178
+                'Applications/Contact' => 'Applications\Form\ContactContainer',
179
+                'Applications/Base'  => 'Applications\Form\Base',
180
+                'Applications/Facts' => 'Applications\Form\Facts',
181
+                'Applications/FactsFieldset' => 'Applications\Form\FactsFieldset',
182
+                'Applications/Attributes' => 'Applications\Form\Attributes',
183
+                'Applications/Filter' => 'Applications\Form\FilterApplication',
184
+                'href' => 'Applications\Form\Element\Ref',
185
+            ),
186 186
         'factories' => array(
187 187
             'Applications/ContactImage' => 'Applications\Factory\Form\ContactImageFactory',
188 188
             'Applications/Attachments' => 'Applications\Factory\Form\AttachmentsFactory',
189 189
         ),
190
-     ),
190
+        ),
191 191
 
192 192
     'form_elements_config' => array(
193 193
         'Applications/Apply' => array(
Please login to merge, or discard this patch.
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.
module/Core/src/Core/Form/View/Helper/FormCollectionContainer.php 3 patches
Indentation   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -55,7 +55,7 @@  discard block
 block discarded – undo
55 55
         $translator = $this->getTranslator();
56 56
         $formContainerHelper = $view->formContainer();
57 57
         $formsMarkup = '';
58
-		$formTemplateWrapper = '<div class="form-collection-container-form">
58
+        $formTemplateWrapper = '<div class="form-collection-container-form">
59 59
             <button type="button" class="btn btn-sm btn-danger pull-right form-collection-container-remove-button">' . $translator->translate('Remove') . '</button>
60 60
             %s
61 61
         </div>';
@@ -66,16 +66,16 @@  discard block
 block discarded – undo
66 66
         }
67 67
         
68 68
         $templateForm = $container->getTemplateForm();
69
-		$templateMarkup = sprintf(
69
+        $templateMarkup = sprintf(
70 70
             $view->formCollection()->getTemplateWrapper(),
71 71
             $view->escapeHtmlAttr(sprintf($formTemplateWrapper, $formContainerHelper->renderElement($templateForm, $layout, $parameter)))
72 72
         );
73 73
         
74
-		return sprintf('<div class="form-collection-container" data-new-entry-key="%s" data-remove-action="%s" data-remove-question="%s">
74
+        return sprintf('<div class="form-collection-container" data-new-entry-key="%s" data-remove-action="%s" data-remove-question="%s">
75 75
                 <h3>%s</h3>
76 76
                 %s%s%s
77 77
             </div>',
78
-		    CollectionContainer::NEW_ENTRY,
78
+            CollectionContainer::NEW_ENTRY,
79 79
             $container->formatAction('remove'),
80 80
             $translator->translate('Really remove?'),
81 81
             $container->getLabel(),
Please login to merge, or discard this patch.
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -56,7 +56,7 @@  discard block
 block discarded – undo
56 56
         $formContainerHelper = $view->formContainer();
57 57
         $formsMarkup = '';
58 58
 		$formTemplateWrapper = '<div class="form-collection-container-form">
59
-            <button type="button" class="btn btn-sm btn-danger pull-right form-collection-container-remove-button">' . $translator->translate('Remove') . '</button>
59
+            <button type="button" class="btn btn-sm btn-danger pull-right form-collection-container-remove-button">' . $translator->translate('Remove').'</button>
60 60
             %s
61 61
         </div>';
62 62
         
@@ -81,7 +81,7 @@  discard block
 block discarded – undo
81 81
             $container->getLabel(),
82 82
             $formsMarkup,
83 83
             $templateMarkup,
84
-            '<div class="form-collection-container-add-wrapper"><button type="button" class="btn btn-success form-collection-container-add-button">' . sprintf($translator->translate('Add %s'), $container->getLabel()) . '</button></div>'
84
+            '<div class="form-collection-container-add-wrapper"><button type="button" class="btn btn-success form-collection-container-add-button">'.sprintf($translator->translate('Add %s'), $container->getLabel()).'</button></div>'
85 85
         );
86 86
     }
87 87
 }
Please login to merge, or discard this patch.
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.
module/Cv/src/Cv/Form/SkillCollectionFactory.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -16,6 +16,6 @@
 block discarded – undo
16 16
         $container = new \Core\Form\CollectionContainer('CvEmploymentForm', new \Cv\Entity\Employment());
17 17
         $container->setLabel(/*@translate */ 'Employment history');
18 18
         
19
-		return $container;
19
+        return $container;
20 20
     }
21 21
 }
Please login to merge, or discard this patch.
module/Cv/src/Cv/Form/LanguageSkillCollectionFactory.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -16,6 +16,6 @@
 block discarded – undo
16 16
         $container = new \Core\Form\CollectionContainer('CvEmploymentForm', new \Cv\Entity\Employment());
17 17
         $container->setLabel(/*@translate */ 'Employment history');
18 18
         
19
-		return $container;
19
+        return $container;
20 20
     }
21 21
 }
Please login to merge, or discard this patch.
module/Cv/src/Cv/Form/PreferredJobFieldset.php 1 patch
Indentation   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -32,9 +32,9 @@
 block discarded – undo
32 32
     public function init()
33 33
     {
34 34
         $this->setName('preferredJob')
35
-             ->setHydrator(new EntityHydrator())
36
-             ->setObject(new PreferredJob())
37
-             ->setLabel('Desired Employment');
35
+                ->setHydrator(new EntityHydrator())
36
+                ->setObject(new PreferredJob())
37
+                ->setLabel('Desired Employment');
38 38
 
39 39
         $this->add(
40 40
             array(
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.
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -71,7 +71,7 @@  discard block
 block discarded – undo
71 71
      * @var array
72 72
      * @ODM\Collection
73 73
      */
74
-    protected $nativeLanguages=[];
74
+    protected $nativeLanguages = [];
75 75
 
76 76
 
77 77
     /**
@@ -216,7 +216,7 @@  discard block
 block discarded – undo
216 216
 
217 217
     public function setIsDraft($isDraft)
218 218
     {
219
-        $this->isDraft=$isDraft;
219
+        $this->isDraft = $isDraft;
220 220
         return $this;
221 221
     }
222 222
 
@@ -284,7 +284,7 @@  discard block
 block discarded – undo
284 284
      */
285 285
     public function setNativeLanguages($nativeLanguages)
286 286
     {
287
-        $this->nativeLanguages=$nativeLanguages;
287
+        $this->nativeLanguages = $nativeLanguages;
288 288
         return $this;
289 289
     }
290 290
 
Please login to merge, or discard this patch.
Doc Comments   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -139,7 +139,7 @@  discard block
 block discarded – undo
139 139
     }
140 140
     
141 141
     /**
142
-     * @return ArrayCollection
142
+     * @return IdentityWrapper
143 143
      */
144 144
     public function getEducationsIndexedById()
145 145
     {
@@ -168,7 +168,7 @@  discard block
 block discarded – undo
168 168
     }
169 169
     
170 170
     /**
171
-     * @return ArrayCollection
171
+     * @return IdentityWrapper
172 172
      */
173 173
     public function getEmploymentsIndexedById()
174 174
     {
@@ -197,7 +197,7 @@  discard block
 block discarded – undo
197 197
     }
198 198
     
199 199
     /**
200
-     * @return ArrayCollection
200
+     * @return IdentityWrapper
201 201
      */
202 202
     public function getSkillsIndexedById()
203 203
     {
@@ -275,7 +275,7 @@  discard block
 block discarded – undo
275 275
     }
276 276
 
277 277
     /**
278
-     * @return ArrayCollection
278
+     * @return IdentityWrapper
279 279
      */
280 280
     public function getLanguageSkillsIndexedById()
281 281
     {
Please login to merge, or discard this patch.
module/Cv/src/Cv/Entity/PreferredJob.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -64,7 +64,7 @@  discard block
 block discarded – undo
64 64
      */
65 65
     public function setTypeOfApplication($typeOfApplication)
66 66
     {
67
-        $this->typeOfApplication=$typeOfApplication;
67
+        $this->typeOfApplication = $typeOfApplication;
68 68
         return $this;
69 69
     }
70 70
 
@@ -80,7 +80,7 @@  discard block
 block discarded – undo
80 80
     
81 81
     public function setDesiredJob($desiredJob)
82 82
     {
83
-        $this->desiredJob=$desiredJob;
83
+        $this->desiredJob = $desiredJob;
84 84
         return $this;
85 85
     }
86 86
     
@@ -91,7 +91,7 @@  discard block
 block discarded – undo
91 91
 
92 92
     public function setDesiredLocation($desiredLocation)
93 93
     {
94
-        $this->desiredLocation=$desiredLocation;
94
+        $this->desiredLocation = $desiredLocation;
95 95
         return $this;
96 96
     }
97 97
 
@@ -102,7 +102,7 @@  discard block
 block discarded – undo
102 102
 
103 103
     public function setDesiredLocations($desiredLocations)
104 104
     {
105
-        $this->desiredLocation=$desiredLocations;
105
+        $this->desiredLocation = $desiredLocations;
106 106
         return $this;
107 107
     }
108 108
 
@@ -113,7 +113,7 @@  discard block
 block discarded – undo
113 113
     
114 114
     public function setWillingnessToTravel($willingnessToTravel)
115 115
     {
116
-        $this->willingnessToTravel=$willingnessToTravel;
116
+        $this->willingnessToTravel = $willingnessToTravel;
117 117
         return $this;
118 118
     }
119 119
     
@@ -124,7 +124,7 @@  discard block
 block discarded – undo
124 124
 
125 125
     public function setExpectedSalary($expectedSalary)
126 126
     {
127
-        $this->expectedSalary=$expectedSalary;
127
+        $this->expectedSalary = $expectedSalary;
128 128
         return $this;
129 129
     }
130 130
 
Please login to merge, or discard this patch.