Completed
Push — develop ( 321e68...dce9ea )
by Carsten
09:20
created
module/Core/src/Core/Collection/IdentityWrapper.php 4 patches
Doc Comments   -1 removed lines patch added patch discarded remove patch
@@ -381,7 +381,6 @@
 block discarded – undo
381 381
 	}
382 382
 
383 383
 	/**
384
-	 * @param mixed $element
385 384
 	 * @return mixed
386 385
 	 */
387 386
 	protected function getElement($key)
Please login to merge, or discard this patch.
Indentation   +31 added lines, -31 removed lines patch added patch discarded remove patch
@@ -25,7 +25,7 @@  discard block
 block discarded – undo
25 25
      */
26 26
     protected $identityExtractor;
27 27
     
28
-	/**
28
+    /**
29 29
      * @param Collection $collection
30 30
      */
31 31
     public function __construct(Collection $collection)
@@ -81,7 +81,7 @@  discard block
 block discarded – undo
81 81
         $element = $this->getElement($key);
82 82
         
83 83
         if ($element !== false && $this->collection->removeElement($element)) {
84
-    		return $element;
84
+            return $element;
85 85
         }
86 86
     }
87 87
     
@@ -108,7 +108,7 @@  discard block
 block discarded – undo
108 108
     {
109 109
         $element = $this->getElement($key);
110 110
         
111
-		return $element !== false ? $element : null;
111
+        return $element !== false ? $element : null;
112 112
     }
113 113
     
114 114
     /**
@@ -184,7 +184,7 @@  discard block
 block discarded – undo
184 184
         
185 185
         if ($element !== false)
186 186
         {
187
-    		return $this->getKey($element);
187
+            return $this->getKey($element);
188 188
         }
189 189
     }
190 190
     
@@ -252,7 +252,7 @@  discard block
 block discarded – undo
252 252
         // validate mapped elements
253 253
         array_map($this->getIdentityExtractor(), $mapped->toArray());
254 254
         
255
-		return new static($mapped);
255
+        return new static($mapped);
256 256
     }
257 257
     
258 258
     /**
@@ -341,15 +341,15 @@  discard block
 block discarded – undo
341 341
     }
342 342
     
343 343
     /**
344
-	 * @param callable $identityExtractor
345
-	 * @return IdentityWrapper
346
-	 */
347
-	public function setIdentityExtractor(callable $identityExtractor)
348
-	{
349
-		$this->identityExtractor = $identityExtractor;
344
+     * @param callable $identityExtractor
345
+     * @return IdentityWrapper
346
+     */
347
+    public function setIdentityExtractor(callable $identityExtractor)
348
+    {
349
+        $this->identityExtractor = $identityExtractor;
350 350
 		
351
-		return $this;
352
-	}
351
+        return $this;
352
+    }
353 353
 
354 354
     /**
355 355
      *
@@ -371,23 +371,23 @@  discard block
 block discarded – undo
371 371
         return $this->identityExtractor;
372 372
     }
373 373
 
374
-	/**
375
-	 * @param mixed $element
376
-	 * @return mixed
377
-	 */
378
-	protected function getKey($element)
379
-	{
380
-	    return call_user_func($this->getIdentityExtractor(), $element);
381
-	}
374
+    /**
375
+     * @param mixed $element
376
+     * @return mixed
377
+     */
378
+    protected function getKey($element)
379
+    {
380
+        return call_user_func($this->getIdentityExtractor(), $element);
381
+    }
382 382
 
383
-	/**
384
-	 * @param mixed $element
385
-	 * @return mixed
386
-	 */
387
-	protected function getElement($key)
388
-	{
389
-	    return $this->collection->filter(function ($element) use ($key) {
390
-	        return $this->getKey($element) == $key;
391
-	    })->first();
392
-	}
383
+    /**
384
+     * @param mixed $element
385
+     * @return mixed
386
+     */
387
+    protected function getElement($key)
388
+    {
389
+        return $this->collection->filter(function ($element) use ($key) {
390
+            return $this->getKey($element) == $key;
391
+        })->first();
392
+    }
393 393
 }
Please login to merge, or discard this patch.
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -116,7 +116,7 @@  discard block
 block discarded – undo
116 116
      */
117 117
     public function getKeys()
118 118
     {
119
-        return $this->collection->map(function ($element) {
119
+        return $this->collection->map(function($element) {
120 120
             return $this->getKey($element);
121 121
         })->toArray();
122 122
     }
@@ -309,7 +309,7 @@  discard block
 block discarded – undo
309 309
      */
310 310
     public function offsetExists($offset)
311 311
     {
312
-        return (bool)$this->getElement($offset);
312
+        return (bool) $this->getElement($offset);
313 313
     }
314 314
     
315 315
     /**
@@ -359,7 +359,7 @@  discard block
 block discarded – undo
359 359
     {
360 360
         if (!isset($this->identityExtractor)) {
361 361
             // default identity extractor
362
-            $this->identityExtractor = function ($element) {
362
+            $this->identityExtractor = function($element) {
363 363
                 if (!is_callable([$element, 'getId'])) {
364 364
                     throw new \LogicException('$element must have getId() method');
365 365
                 }
@@ -386,7 +386,7 @@  discard block
 block discarded – undo
386 386
 	 */
387 387
 	protected function getElement($key)
388 388
 	{
389
-	    return $this->collection->filter(function ($element) use ($key) {
389
+	    return $this->collection->filter(function($element) use ($key) {
390 390
 	        return $this->getKey($element) == $key;
391 391
 	    })->first();
392 392
 	}
Please login to merge, or discard this patch.
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -137,8 +137,7 @@
 block discarded – undo
137 137
         if ($this->getElement($key) !== false)
138 138
         {
139 139
             $this->collection->set($this->collection->indexOf($value), $value);
140
-        }
141
-        else
140
+        } else
142 141
         {
143 142
             $this->collection->add($value);
144 143
         }
Please login to merge, or discard this patch.
module/Core/src/Core/Form/CollectionContainer.php 3 patches
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -179,7 +179,7 @@
 block discarded – undo
179 179
     
180 180
     /**
181 181
      * @throws \RuntimeException
182
-     * @return Collection
182
+     * @return \Core\Entity\EntityInterface
183 183
      */
184 184
     protected function getCollection()
185 185
     {
Please login to merge, or discard this patch.
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -80,12 +80,12 @@
 block discarded – undo
80 80
             $collection[] = $this->newEntry;
81 81
             $form = $this->buildForm($key, $this->newEntry);
82 82
             $eventManager = $form->getEventManager();
83
-			$eventManager->attach(CoreForm::EVENT_IS_VALID, function (Event $event) use ($collection) {
83
+			$eventManager->attach(CoreForm::EVENT_IS_VALID, function(Event $event) use ($collection) {
84 84
                 if (!$event->getParam('isValid')) {
85 85
                     $collection->removeElement($this->newEntry);
86 86
                 }
87 87
             });
88
-			$eventManager->attach(CoreForm::EVENT_PREPARE, function (Event $event) use ($collection) {
88
+			$eventManager->attach(CoreForm::EVENT_PREPARE, function(Event $event) use ($collection) {
89 89
                 $this->setupForm($event->getTarget(), $collection->indexOf($this->newEntry));
90 90
             });
91 91
             
Please login to merge, or discard this patch.
Indentation   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -80,12 +80,12 @@  discard block
 block discarded – undo
80 80
             $collection[] = $this->newEntry;
81 81
             $form = $this->buildForm($key, $this->newEntry);
82 82
             $eventManager = $form->getEventManager();
83
-			$eventManager->attach(CoreForm::EVENT_IS_VALID, function (Event $event) use ($collection) {
83
+            $eventManager->attach(CoreForm::EVENT_IS_VALID, function (Event $event) use ($collection) {
84 84
                 if (!$event->getParam('isValid')) {
85 85
                     $collection->removeElement($this->newEntry);
86 86
                 }
87 87
             });
88
-			$eventManager->attach(CoreForm::EVENT_PREPARE, function (Event $event) use ($collection) {
88
+            $eventManager->attach(CoreForm::EVENT_PREPARE, function (Event $event) use ($collection) {
89 89
                 $this->setupForm($event->getTarget(), $collection->indexOf($this->newEntry));
90 90
             });
91 91
             
@@ -117,7 +117,7 @@  discard block
 block discarded – undo
117 117
         }
118 118
     }
119 119
     
120
-	/**
120
+    /**
121 121
      * @see \Core\Form\Element\ViewHelperProviderInterface::getViewHelper()
122 122
      */
123 123
     public function getViewHelper()
@@ -221,7 +221,7 @@  discard block
 block discarded – undo
221 221
      */
222 222
     protected function setupForm(CoreForm $form, $key)
223 223
     {
224
-         $form->setAttribute('action', sprintf('?form=%s', $this->formatAction($key)))
224
+            $form->setAttribute('action', sprintf('?form=%s', $this->formatAction($key)))
225 225
             ->setAttribute('data-entry-key', $key)
226 226
             ->setOption('control_buttons', [[
227 227
                 'class' => 'btn-danger form-collection-container-remove-button',
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/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.