hotline #106570 fix import patrons with DOS encoded file

VERSIONS_HOTLINE/106570

+ - ticket #106570 : Correction de l'import des abonnés via fichier CSV au format DOS
\ No newline at end of file

library/Class/Cosmogramme/Integration/PhasePatrons.php

@@ -39,7 +39,6 @@ class Class_Cosmogramme_Integration_PhasePatrons extends Class_Cosmogramme_Integ
 
   public function importPatronRecord($data, $integration) {
     $patron = new Class_Cosmogramme_Integration_Record_Patron($integration);
-
     return $patron->import($integration->isFormatXml()
                            ? $data
                            : $this->mapRecordColumns($integration, $data),

library/Class/Cosmogramme/Integration/Record/Patron.php

@@ -41,6 +41,8 @@ class Class_Cosmogramme_Integration_Record_Patron {
 
 
   public function importFicheArray($enreg) {
+    $enreg = array_map([$this, 'changeAccents'],
+                       $enreg);
     $enreg = $this->prepareData($enreg);
 
     if ($library_code = $this->_known_fields->libraryCodeFrom($enreg)) {

tests/library/Class/Cosmogramme/Integration/PhasePatronsTest.php

@@ -739,4 +739,40 @@ class PhasePatronsUpdateWithEmptyMailTest extends PhasePatronsTestCase {
   public function harlockShouldHaveEmptyMail() {
     $this->assertEquals('', Class_Users::find(4293)->getMail());
   }
+}
+
+
+
+
+class PhasePatronsCsvDosTest extends PhasePatronsTestCase {
+  protected $_helene;
+
+   public function setUp() {
+    parent::setUp();
+
+    Class_IntProfilDonnees::find(102)
+      ->setAccents(Class_IntProfilDonnees::ENCODING_ASCII_DOS)
+      ->setAttributs([1 => ['champs' => 'IDABON;PASSWORD;NOM;PRENOM;ID_SIGB;DATE_DEBUT;DATE_FIN']])
+      ->assertSave();
+
+    Class_Cosmogramme_Integration::find(999)
+      ->setFichier('patron_dos.csv')
+      ->assertSave();
+
+    $this->_phase->run();
+
+    $this->_helene = Class_Users::findFirstBy(['order' => 'id desc']);
+  }
+
+
+  /** @test */
+  public function prenomShouldBeHelene() {
+    $this->assertEquals('Hélène', $this->_helene->getPrenom());
+  }
+
+
+  /** @test */
+  public function idabonShouldBe1000305148() {
+    $this->assertEquals('1000305148', $this->_helene->getIdabon());
+  }
 }
\ No newline at end of file

tests/library/Class/Cosmogramme/Integration/patron_dos.csv

+1000305148|1982|FRANI|Hlne|4062|13/01/2020|13/01/2021