Merge branch 'master' into 232_resources_comment

src/Bundle/ChillPersonBundle/Serializer/Normalizer/AccompanyingPeriodDocGenNormalizer.php

@@ -98,7 +98,7 @@ class AccompanyingPeriodDocGenNormalizer implements ContextAwareNormalizerInterf
 
     /**
      * @param AccompanyingPeriod|null $period
-     * @param null|string $format
+     * @param string|null $format
      */
     public function normalize($period, $format = null, array $context = [])
     {

src/Bundle/ChillPersonBundle/Serializer/Normalizer/AccompanyingPeriodOriginNormalizer.php

@@ -21,7 +21,7 @@ final class AccompanyingPeriodOriginNormalizer implements NormalizerInterface
 {
     /**
      * @param Origin $origin
-     * @param null|string $format
+     * @param string|null $format
      */
     public function normalize($origin, $format = null, array $context = [])
     {

src/Bundle/ChillPersonBundle/Serializer/Normalizer/AccompanyingPeriodParticipationNormalizer.php

@@ -21,7 +21,7 @@ class AccompanyingPeriodParticipationNormalizer implements NormalizerAwareInterf
 
     /**
      * @param AccompanyingPeriodParticipation $participation
-     * @param null|string $format
+     * @param string|null $format
      */
     public function normalize($participation, $format = null, array $context = [])
     {

src/Bundle/ChillPersonBundle/Serializer/Normalizer/PersonJsonNormalizer.php

@@ -168,7 +168,7 @@ class PersonJsonNormalizer implements
 
     /**
      * @param Person $person
-     * @param null|string $format
+     * @param string|null $format
      */
     public function normalize($person, $format = null, array $context = [])
     {

src/Bundle/ChillPersonBundle/Serializer/Normalizer/RelationshipDocGenNormalizer.php

@@ -31,7 +31,7 @@ class RelationshipDocGenNormalizer implements ContextAwareNormalizerInterface, N
 
     /**
      * @param Relationship $relation
-     * @param null|string $format
+     * @param string|null $format
      */
     public function normalize($relation, $format = null, array $context = [])
     {