From 378f5fa107f3e504ae75faa6a1090e7f8d86e448 Mon Sep 17 00:00:00 2001
From: Jephte Clain <Jephte.Clain@univ-reunion.fr>
Date: Mon, 17 Jun 2024 22:41:34 +0400
Subject: [PATCH] modifs.mineures sans commentaires

---
 src/A.php                       | 32 ++++++++++++++++++++++++++++++++
 src/file/csv/AbstractReader.php |  2 ++
 2 files changed, 34 insertions(+)

diff --git a/src/A.php b/src/A.php
index 4c232a8..3123a9d 100644
--- a/src/A.php
+++ b/src/A.php
@@ -36,6 +36,38 @@ class A {
     return false;
   }
 
+  /**
+   * s'assurer que $array est un tableau de $size éléments, en complétant avec
+   * des occurrences de $default si nécessaire
+   *
+   * @return bool true si le tableau a été modifié, false sinon
+   */
+  static final function ensure_size(?array &$array, int $size, $default=null): bool {
+    $modified = false;
+    if ($array === null) {
+      $array = [];
+      $modified = true;
+    }
+    if ($size < 0) return $modified;
+    $count = count($array);
+    if ($count == $size) return $modified;
+    if ($count < $size) {
+      # agrandir le tableau
+      while ($count++ < $size) {
+        $array[] = $default;
+      }
+      return true;
+    }
+    # rétrécir le tableau
+    $tmparray = [];
+    foreach ($array as $key => $value) {
+      if ($size-- == 0) break;
+      $tmparray[$key] = $value;
+    }
+    $array = $tmparray;
+    return true;
+  }
+
   static function merge(&$dest, ...$merges): void {
     self::ensure_narray($dest);
     $dest = cl::merge($dest, ...$merges);
diff --git a/src/file/csv/AbstractReader.php b/src/file/csv/AbstractReader.php
index 7c3db9f..8f502b9 100644
--- a/src/file/csv/AbstractReader.php
+++ b/src/file/csv/AbstractReader.php
@@ -1,6 +1,7 @@
 <?php
 namespace nur\sery\file\csv;
 
+use nur\sery\A;
 use nur\sery\php\time\Date;
 use nur\sery\php\time\DateTime;
 
@@ -71,6 +72,7 @@ abstract class AbstractReader  implements IReader {
       }
       return false;
     }
+    A::ensure_size($row, count($this->headers));
     $row = array_combine($this->headers, $row);
     return true;
   }