Merge branch 'upgrade-sf3' into add_email_and_phone_to_person

This commit is contained in:
2018-08-20 11:31:35 +02:00
17 changed files with 199 additions and 59 deletions

View File

@@ -25,7 +25,7 @@ class PersonToIdTransformer implements DataTransformerInterface
/**
* Transforms an object (issue) to a string (id).
*
* @param Issue|null $issue
* @param Person|null $issue
* @return string
*/
public function transform($issue)
@@ -42,7 +42,7 @@ class PersonToIdTransformer implements DataTransformerInterface
*
* @param string $id
*
* @return Issue|null
* @return Person|null
*
* @throws TransformationFailedException if object (issue) is not found.
*/

View File

@@ -23,7 +23,8 @@ class GenderType extends AbstractType {
$a = array(
Person::MALE_GENDER => Person::MALE_GENDER,
Person::FEMALE_GENDER => Person::FEMALE_GENDER
Person::FEMALE_GENDER => Person::FEMALE_GENDER,
Person::BOTH_GENDER => Person::BOTH_GENDER
);
$resolver->setDefaults(array(