Chill-project/chill-bundles
6
0
Fork 0
mirror of https://gitlab.com/Chill-Projet/chill-bundles.git synced 2025-06-07 18:44:08 +00:00
Code Issues Actions Projects Releases Wiki Activity

Merge branch '362-bug-manager-registry-fix2' into 'master'

Browse Source 
Resolve loading of manager registry

Closes #362

See merge request Chill-Projet/chill-bundles!803
This commit is contained in:
LenaertsJ 2025-03-05 16:45:08 +00:00
commit 40eb71f95a
6 changed files with 51 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.changes/unreleased/Fixed-20250304-160058.yaml Normal file
View File

@ -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

5
src/Bundle/ChillMainBundle/CRUD/Controller/AbstractCRUDController.php
View File

@ -63,7 +63,6 @@ abstract class AbstractCRUDController extends AbstractController
parent::getSubscribedServices(), parent::getSubscribedServices(),
[ [
'chill_main.paginator_factory' => PaginatorFactory::class, 'chill_main.paginator_factory' => PaginatorFactory::class,
ManagerRegistry::class => ManagerRegistry::class,
'translator' => TranslatorInterface::class, 'translator' => TranslatorInterface::class,
AuthorizationHelper::class => AuthorizationHelper::class, AuthorizationHelper::class => AuthorizationHelper::class,
EventDispatcherInterface::class => EventDispatcherInterface::class, EventDispatcherInterface::class => EventDispatcherInterface::class,
@ -213,7 +212,7 @@ abstract class AbstractCRUDController extends AbstractController
protected function getManagerRegistry(): ManagerRegistry 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 protected function getValidator(): ValidatorInterface
{ {
return $this->get('validator'); return $this->container->get('validator');
} }
/** /**

4
src/Bundle/ChillMainBundle/Service/Import/AddressReferenceBEFromBestAddress.php
View File

@ -68,8 +68,8 @@ class AddressReferenceBEFromBestAddress
$csv->setDelimiter(','); $csv->setDelimiter(',');
$csv->setHeaderOffset(0); $csv->setHeaderOffset(0);
$stmt = Statement::create() $stmt = new Statement();
->process($csv); $stmt = $stmt->process($csv);
foreach ($stmt as $record) { foreach ($stmt as $record) {
$this->baseImporter->importAddress( $this->baseImporter->importAddress(

52
src/Bundle/ChillMainBundle/Service/Import/AddressReferenceFromBAN.php
View File

@ -55,32 +55,32 @@ class AddressReferenceFromBAN
$csv = Reader::createFromStream($csvDecompressed); $csv = Reader::createFromStream($csvDecompressed);
$csv->setDelimiter(';')->setHeaderOffset(0); $csv->setDelimiter(';')->setHeaderOffset(0);
$stmt = Statement::create() $stmt = new Statement();
->process($csv, [ $stmt = $stmt->process($csv, [
'id', 'id',
'id_fantoir', 'id_fantoir',
'numero', 'numero',
'rep', 'rep',
'nom_voie', 'nom_voie',
'code_postal', 'code_postal',
'code_insee', 'code_insee',
'nom_commune', 'nom_commune',
'code_insee_ancienne_commune', 'code_insee_ancienne_commune',
'nom_ancienne_commune', 'nom_ancienne_commune',
'x', 'x',
'y', 'y',
'lon', 'lon',
'lat', 'lat',
'type_position', 'type_position',
'alias', 'alias',
'nom_ld', 'nom_ld',
'libelle_acheminement', 'libelle_acheminement',
'nom_afnor', 'nom_afnor',
'source_position', 'source_position',
'source_nom_voie', 'source_nom_voie',
'certification_commune', 'certification_commune',
'cad_parcelles', 'cad_parcelles',
]); ]);
foreach ($stmt as $record) { foreach ($stmt as $record) {
$this->baseImporter->importAddress( $this->baseImporter->importAddress(

22
src/Bundle/ChillMainBundle/Service/Import/AddressReferenceFromBano.php
View File

@ -43,17 +43,17 @@ class AddressReferenceFromBano
$csv = Reader::createFromStream($file); $csv = Reader::createFromStream($file);
$csv->setDelimiter(','); $csv->setDelimiter(',');
$stmt = Statement::create() $stmt = new Statement();
->process($csv, [ $stmt = $stmt->process($csv, [
'refId', 'refId',
'streetNumber', 'streetNumber',
'street', 'street',
'postcode', 'postcode',
'city', 'city',
'_o', '_o',
'lat', 'lat',
'lon', 'lon',
]); ]);
foreach ($stmt as $record) { foreach ($stmt as $record) {
$this->baseImporter->importAddress( $this->baseImporter->importAddress(

6
src/Bundle/ChillMainBundle/Service/Import/AddressReferenceLU.php
View File

@ -54,7 +54,8 @@ class AddressReferenceLU
private function process_address(Reader $csv, ?string $sendAddressReportToEmail = null): void 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) { foreach ($stmt as $record) {
$this->addressBaseImporter->importAddress( $this->addressBaseImporter->importAddress(
$record['id_geoportail'], $record['id_geoportail'],
@ -74,7 +75,8 @@ class AddressReferenceLU
private function process_postal_code(Reader $csv): void private function process_postal_code(Reader $csv): void
{ {
$stmt = Statement::create()->process($csv); $stmt = new Statement();
$stmt = $stmt->process($csv);
$arr_postal_codes = []; $arr_postal_codes = [];
foreach ($stmt as $record) { foreach ($stmt as $record) {
if (false === \array_key_exists($record['code_postal'], $arr_postal_codes)) { if (false === \array_key_exists($record['code_postal'], $arr_postal_codes)) {