Merge branch 'master' into upgrade-php82

This commit is contained in:
2023-03-20 12:40:58 +01:00
18 changed files with 133 additions and 70 deletions

View File

@@ -17,6 +17,7 @@ use Chill\MainBundle\Repository\RegroupmentRepository;
use Exception;
use Symfony\Component\Form\DataMapperInterface;
use Symfony\Component\Form\FormInterface;
use function array_key_exists;
use function count;
class ExportPickCenterDataMapper implements DataMapperInterface
@@ -29,7 +30,7 @@ class ExportPickCenterDataMapper implements DataMapperInterface
*
* @throws Exception
*
* @return mixed
* @return void
*/
public function mapDataToForms($data, $forms)
{
@@ -72,10 +73,12 @@ class ExportPickCenterDataMapper implements DataMapperInterface
$centers[spl_object_hash($center)] = $center;
}
foreach ($forms['regroupment']->getData() as $regroupment) {
/** @var Regroupment $regroupment */
foreach ($regroupment->getCenters() as $center) {
$centers[spl_object_hash($center)] = $center;
if (array_key_exists('regroupment', $forms)) {
foreach ($forms['regroupment']->getData() as $regroupment) {
/** @var Regroupment $regroupment */
foreach ($regroupment->getCenters() as $center) {
$centers[spl_object_hash($center)] = $center;
}
}
}