diff --git a/.changes/unreleased/Fixed-20250304-160058.yaml b/.changes/unreleased/Fixed-20250304-160058.yaml new file mode 100644 index 000000000..d2e9cf3ed --- /dev/null +++ b/.changes/unreleased/Fixed-20250304-160058.yaml @@ -0,0 +1,6 @@ +kind: Fixed +body: Fix Dependency Injection, which prevented to save the CalendarRange +time: 2025-03-04T16:00:58.269626007+01:00 +custom: + Issue: "362" + SchemaChange: No schema change diff --git a/src/Bundle/ChillMainBundle/CRUD/Controller/AbstractCRUDController.php b/src/Bundle/ChillMainBundle/CRUD/Controller/AbstractCRUDController.php index ea5e55a69..1cbf69630 100644 --- a/src/Bundle/ChillMainBundle/CRUD/Controller/AbstractCRUDController.php +++ b/src/Bundle/ChillMainBundle/CRUD/Controller/AbstractCRUDController.php @@ -63,7 +63,6 @@ abstract class AbstractCRUDController extends AbstractController parent::getSubscribedServices(), [ 'chill_main.paginator_factory' => PaginatorFactory::class, - ManagerRegistry::class => ManagerRegistry::class, 'translator' => TranslatorInterface::class, AuthorizationHelper::class => AuthorizationHelper::class, EventDispatcherInterface::class => EventDispatcherInterface::class, @@ -213,7 +212,7 @@ abstract class AbstractCRUDController extends AbstractController protected function getManagerRegistry(): ManagerRegistry { - return $this->container->get(ManagerRegistry::class); + return $this->container->get('doctrine'); } /** @@ -226,7 +225,7 @@ abstract class AbstractCRUDController extends AbstractController protected function getValidator(): ValidatorInterface { - return $this->get('validator'); + return $this->container->get('validator'); } /** diff --git a/src/Bundle/ChillMainBundle/Service/Import/AddressReferenceBEFromBestAddress.php b/src/Bundle/ChillMainBundle/Service/Import/AddressReferenceBEFromBestAddress.php index ea6575e43..fcf49079f 100644 --- a/src/Bundle/ChillMainBundle/Service/Import/AddressReferenceBEFromBestAddress.php +++ b/src/Bundle/ChillMainBundle/Service/Import/AddressReferenceBEFromBestAddress.php @@ -68,8 +68,8 @@ class AddressReferenceBEFromBestAddress $csv->setDelimiter(','); $csv->setHeaderOffset(0); - $stmt = Statement::create() - ->process($csv); + $stmt = new Statement(); + $stmt = $stmt->process($csv); foreach ($stmt as $record) { $this->baseImporter->importAddress( diff --git a/src/Bundle/ChillMainBundle/Service/Import/AddressReferenceFromBAN.php b/src/Bundle/ChillMainBundle/Service/Import/AddressReferenceFromBAN.php index b45760592..1c03b7bfb 100644 --- a/src/Bundle/ChillMainBundle/Service/Import/AddressReferenceFromBAN.php +++ b/src/Bundle/ChillMainBundle/Service/Import/AddressReferenceFromBAN.php @@ -55,32 +55,32 @@ class AddressReferenceFromBAN $csv = Reader::createFromStream($csvDecompressed); $csv->setDelimiter(';')->setHeaderOffset(0); - $stmt = Statement::create() - ->process($csv, [ - 'id', - 'id_fantoir', - 'numero', - 'rep', - 'nom_voie', - 'code_postal', - 'code_insee', - 'nom_commune', - 'code_insee_ancienne_commune', - 'nom_ancienne_commune', - 'x', - 'y', - 'lon', - 'lat', - 'type_position', - 'alias', - 'nom_ld', - 'libelle_acheminement', - 'nom_afnor', - 'source_position', - 'source_nom_voie', - 'certification_commune', - 'cad_parcelles', - ]); + $stmt = new Statement(); + $stmt = $stmt->process($csv, [ + 'id', + 'id_fantoir', + 'numero', + 'rep', + 'nom_voie', + 'code_postal', + 'code_insee', + 'nom_commune', + 'code_insee_ancienne_commune', + 'nom_ancienne_commune', + 'x', + 'y', + 'lon', + 'lat', + 'type_position', + 'alias', + 'nom_ld', + 'libelle_acheminement', + 'nom_afnor', + 'source_position', + 'source_nom_voie', + 'certification_commune', + 'cad_parcelles', + ]); foreach ($stmt as $record) { $this->baseImporter->importAddress( diff --git a/src/Bundle/ChillMainBundle/Service/Import/AddressReferenceFromBano.php b/src/Bundle/ChillMainBundle/Service/Import/AddressReferenceFromBano.php index 5ee3f6964..be20bbc11 100644 --- a/src/Bundle/ChillMainBundle/Service/Import/AddressReferenceFromBano.php +++ b/src/Bundle/ChillMainBundle/Service/Import/AddressReferenceFromBano.php @@ -43,17 +43,17 @@ class AddressReferenceFromBano $csv = Reader::createFromStream($file); $csv->setDelimiter(','); - $stmt = Statement::create() - ->process($csv, [ - 'refId', - 'streetNumber', - 'street', - 'postcode', - 'city', - '_o', - 'lat', - 'lon', - ]); + $stmt = new Statement(); + $stmt = $stmt->process($csv, [ + 'refId', + 'streetNumber', + 'street', + 'postcode', + 'city', + '_o', + 'lat', + 'lon', + ]); foreach ($stmt as $record) { $this->baseImporter->importAddress( diff --git a/src/Bundle/ChillMainBundle/Service/Import/AddressReferenceLU.php b/src/Bundle/ChillMainBundle/Service/Import/AddressReferenceLU.php index 86c1b61b8..e1294732b 100644 --- a/src/Bundle/ChillMainBundle/Service/Import/AddressReferenceLU.php +++ b/src/Bundle/ChillMainBundle/Service/Import/AddressReferenceLU.php @@ -54,7 +54,8 @@ class AddressReferenceLU private function process_address(Reader $csv, ?string $sendAddressReportToEmail = null): void { - $stmt = Statement::create()->process($csv); + $stmt = new Statement(); + $stmt = $stmt->process($csv); foreach ($stmt as $record) { $this->addressBaseImporter->importAddress( $record['id_geoportail'], @@ -74,7 +75,8 @@ class AddressReferenceLU private function process_postal_code(Reader $csv): void { - $stmt = Statement::create()->process($csv); + $stmt = new Statement(); + $stmt = $stmt->process($csv); $arr_postal_codes = []; foreach ($stmt as $record) { if (false === \array_key_exists($record['code_postal'], $arr_postal_codes)) {