Merge remote-tracking branch 'origin/master' into 110-export-editable

This commit is contained in:
2023-06-26 11:06:52 +02:00
60 changed files with 1286 additions and 248 deletions

View File

@@ -166,7 +166,7 @@ class LoadReports extends AbstractFixture implements ContainerAwareInterface, Or
/**
* pick a random choice.
*
* @return string|string[] the array of slug if multiple, a single slug otherwise
* @return string|string[]
*/
private function getRandomChoice(CustomField $field)
{
@@ -211,6 +211,8 @@ class LoadReports extends AbstractFixture implements ContainerAwareInterface, Or
return $result;
}
}
return $picked;
}
/**
@@ -226,7 +228,7 @@ class LoadReports extends AbstractFixture implements ContainerAwareInterface, Or
/**
* pick a choice within a 'choices' options (for choice type).
*
* @return the slug of the selected choice
* @return string the slug of the selected choice
*/
private function pickChoice(array $choices)
{