From 21688ac0e1179a4a70c1030e77faebc592f4c4aa Mon Sep 17 00:00:00 2001
From: Jephte Clain <Jephte.Clain@univ-reunion.fr>
Date: Thu, 13 Jun 2024 07:32:06 +0400
Subject: [PATCH] modifs.mineures sans commentaires

---
 lib/launch.php                                  | 2 +-
 src/{wip => }/app/launcher.php                  | 7 ++-----
 src/{file/csv => ext/spreadsheet}/SsBuilder.php | 5 +++--
 src/{file/csv => ext/spreadsheet}/SsReader.php  | 9 +++------
 src/file/csv/AbstractReader.php                 | 2 --
 5 files changed, 9 insertions(+), 16 deletions(-)
 rename src/{wip => }/app/launcher.php (93%)
 rename src/{file/csv => ext/spreadsheet}/SsBuilder.php (96%)
 rename src/{file/csv => ext/spreadsheet}/SsReader.php (95%)

diff --git a/lib/launch.php b/lib/launch.php
index de58548..f5b4c5d 100755
--- a/lib/launch.php
+++ b/lib/launch.php
@@ -4,7 +4,7 @@ require $_composer_autoload_path?? __DIR__.'/../vendor/autoload.php';
 
 use nur\cli\Application;
 use nur\sery\wip\app\app;
-use nur\sery\wip\app\launcher;
+use nur\sery\app\launcher;
 use nur\yaml;
 
 Application::run(new class extends Application {
diff --git a/src/wip/app/launcher.php b/src/app/launcher.php
similarity index 93%
rename from src/wip/app/launcher.php
rename to src/app/launcher.php
index 5d4baad..dd472f9 100644
--- a/src/wip/app/launcher.php
+++ b/src/app/launcher.php
@@ -1,17 +1,14 @@
 <?php
-namespace nur\sery\wip\app;
+namespace nur\sery\app;
 
-use Exception;
 use nur\b\proc\Cmd;
-use nur\sery\app\RunFile;
 use nur\sery\output\msg;
 use nur\sery\StateException;
-use nur\yaml;
 
 class launcher {
   static function launch(string $appClass, ...$args): int {
     $cmd = new Cmd([
-      __DIR__."/../../../lib/launch.php",
+      __DIR__."/../../lib/launch.php",
       $appClass,
       ...$args,
     ]);
diff --git a/src/file/csv/SsBuilder.php b/src/ext/spreadsheet/SsBuilder.php
similarity index 96%
rename from src/file/csv/SsBuilder.php
rename to src/ext/spreadsheet/SsBuilder.php
index c25cdc3..91b318e 100644
--- a/src/file/csv/SsBuilder.php
+++ b/src/ext/spreadsheet/SsBuilder.php
@@ -1,7 +1,8 @@
 <?php
-namespace nur\sery\file\csv;
+namespace nur\sery\ext\spreadsheet;
 
-use nur\sery\ext\spreadsheet\wsutils;
+use nur\sery\file\csv\AbstractBuilder;
+use nur\sery\file\csv\TAbstractBuilder;
 use nur\sery\os\path;
 use nur\sery\web\http;
 use PhpOffice\PhpSpreadsheet\Cell\IValueBinder;
diff --git a/src/file/csv/SsReader.php b/src/ext/spreadsheet/SsReader.php
similarity index 95%
rename from src/file/csv/SsReader.php
rename to src/ext/spreadsheet/SsReader.php
index ca7a518..5e4b1de 100644
--- a/src/file/csv/SsReader.php
+++ b/src/ext/spreadsheet/SsReader.php
@@ -1,15 +1,12 @@
 <?php
-namespace nur\sery\file\csv;
+namespace nur\sery\ext\spreadsheet;
 
 use nur\sery\cl;
-use nur\sery\ext\spreadsheet\wsutils;
-use nur\sery\file\web\Upload;
-use nur\sery\php\time\Date;
-use nur\sery\php\time\DateTime;
+use nur\sery\file\csv\AbstractReader;
+use nur\sery\file\csv\TAbstractReader;
 use PhpOffice\PhpSpreadsheet\Cell\DataType;
 use PhpOffice\PhpSpreadsheet\IOFactory;
 use PhpOffice\PhpSpreadsheet\RichText\RichText;
-use PhpOffice\PhpSpreadsheet\Worksheet\Worksheet;
 
 class SsReader extends AbstractReader {
   use TAbstractReader;
diff --git a/src/file/csv/AbstractReader.php b/src/file/csv/AbstractReader.php
index 6a8444e..82bd29d 100644
--- a/src/file/csv/AbstractReader.php
+++ b/src/file/csv/AbstractReader.php
@@ -1,8 +1,6 @@
 <?php
 namespace nur\sery\file\csv;
 
-use IteratorAggregate;
-use nur\sery\php\func;
 use nur\sery\php\time\Date;
 use nur\sery\php\time\DateTime;