From 7a2223021caf7de5e9e4edc6f4c6dee89c3d0aab Mon Sep 17 00:00:00 2001 From: Jephte Clain Date: Wed, 28 May 2025 16:02:20 +0200 Subject: [PATCH] corriger SpoutReader --- src/ext/spout/SpoutReader.php | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/src/ext/spout/SpoutReader.php b/src/ext/spout/SpoutReader.php index 754d51f..c6887c6 100644 --- a/src/ext/spout/SpoutReader.php +++ b/src/ext/spout/SpoutReader.php @@ -3,7 +3,10 @@ namespace nulib\ext\spout; use nulib\cl; use nulib\file\tab\AbstractReader; -use OpenSpout\Reader\Common\Creator\ReaderEntityFactory; +use nulib\ValueException; +use OpenSpout\Reader\CSV\Reader as CsvReader; +use OpenSpout\Reader\ODS\Reader as ODSReader; +use OpenSpout\Reader\XLSX\Reader as XLSXReader; class SpoutReader extends AbstractReader { /** @var string|int|null nom de la feuille depuis laquelle lire */ @@ -67,14 +70,16 @@ class SpoutReader extends AbstractReader { function getIterator() { switch ($this->ssType) { case "ods": - $ss = ReaderEntityFactory::createODSReader(); + $ss = new ODSReader(); break; case "xlsx": - $ss = ReaderEntityFactory::createXLSXReader(); + $ss = new XLSXReader(); + break; + case "csv": + $ss = new CsvReader(); break; default: - $ss = ReaderEntityFactory::createReaderFromFile($this->input); - break; + throw ValueException::invalid_kind($this->ssType, "file type"); } $ss->open($this->input); try {