From 6489759d0e71e383097cb4ee78ccec88a47d3f19 Mon Sep 17 00:00:00 2001
From: Jephte Clain <Jephte.Clain@univ-reunion.fr>
Date: Wed, 27 Nov 2024 10:29:07 +0400
Subject: [PATCH] =?UTF-8?q?r=C3=A9organiser?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 php/src/app/cli/include-launcher.php           | 2 +-
 php/src/db/pdo/Pdo.php                         | 2 --
 php/src/file/_IFile.php                        | 1 +
 php/src/file/csv/CsvBuilder.php                | 2 ++
 php/src/file/csv/CsvReader.php                 | 2 ++
 php/src/file/{csv => tab}/AbstractBuilder.php  | 2 +-
 php/src/file/{csv => tab}/AbstractReader.php   | 2 +-
 php/src/file/{csv => tab}/IBuilder.php         | 2 +-
 php/src/file/{csv => tab}/IReader.php          | 2 +-
 php/src/file/{csv => tab}/TAbstractBuilder.php | 3 ++-
 php/src/file/{csv => tab}/TAbstractReader.php  | 3 ++-
 php/src/tools/BgLauncherApp.php                | 6 +++---
 php/src/tools/SteamTrainApp.php                | 4 ++--
 13 files changed, 19 insertions(+), 14 deletions(-)
 rename php/src/file/{csv => tab}/AbstractBuilder.php (99%)
 rename php/src/file/{csv => tab}/AbstractReader.php (99%)
 rename php/src/file/{csv => tab}/IBuilder.php (91%)
 rename php/src/file/{csv => tab}/IReader.php (75%)
 rename php/src/file/{csv => tab}/TAbstractBuilder.php (96%)
 rename php/src/file/{csv => tab}/TAbstractReader.php (96%)

diff --git a/php/src/app/cli/include-launcher.php b/php/src/app/cli/include-launcher.php
index 99ebabf..0958cb7 100644
--- a/php/src/app/cli/include-launcher.php
+++ b/php/src/app/cli/include-launcher.php
@@ -3,8 +3,8 @@
 # les constantes suivantes doivent être définies AVANT de chager ce script:
 # - NULIB_APP_app_params : paramètres du projet
 
-use nulib\os\path;
 use nulib\app;
+use nulib\os\path;
 
 if ($argc <= 1) die("invalid arguments");
 
diff --git a/php/src/db/pdo/Pdo.php b/php/src/db/pdo/Pdo.php
index e6add03..b353d8d 100644
--- a/php/src/db/pdo/Pdo.php
+++ b/php/src/db/pdo/Pdo.php
@@ -7,8 +7,6 @@ use nulib\db\_private\Tvalues;
 use nulib\db\IDatabase;
 use nulib\db\ITransactor;
 use nulib\php\nur_func;
-use nulib\php\time\Date;
-use nulib\php\time\DateTime;
 use nulib\ValueException;
 
 class Pdo implements IDatabase {
diff --git a/php/src/file/_IFile.php b/php/src/file/_IFile.php
index 1c599e5..f62560e 100644
--- a/php/src/file/_IFile.php
+++ b/php/src/file/_IFile.php
@@ -2,6 +2,7 @@
 namespace nulib\file;
 
 use Iterator;
+use nulib\file\tab\IReader;
 use nulib\os\IOException;
 use nulib\php\ICloseable;
 
diff --git a/php/src/file/csv/CsvBuilder.php b/php/src/file/csv/CsvBuilder.php
index c8f6947..1147e02 100644
--- a/php/src/file/csv/CsvBuilder.php
+++ b/php/src/file/csv/CsvBuilder.php
@@ -1,6 +1,8 @@
 <?php
 namespace nulib\file\csv;
 
+use nulib\file\tab\AbstractBuilder;
+use nulib\file\tab\TAbstractBuilder;
 use nulib\web\http;
 
 /**
diff --git a/php/src/file/csv/CsvReader.php b/php/src/file/csv/CsvReader.php
index d05b2e0..d923976 100644
--- a/php/src/file/csv/CsvReader.php
+++ b/php/src/file/csv/CsvReader.php
@@ -3,6 +3,8 @@ namespace nulib\file\csv;
 
 use nulib\file;
 use nulib\file\FileReader;
+use nulib\file\tab\AbstractReader;
+use nulib\file\tab\TAbstractReader;
 
 class CsvReader extends AbstractReader {
   use TAbstractReader;
diff --git a/php/src/file/csv/AbstractBuilder.php b/php/src/file/tab/AbstractBuilder.php
similarity index 99%
rename from php/src/file/csv/AbstractBuilder.php
rename to php/src/file/tab/AbstractBuilder.php
index 24212b6..0a48bc9 100644
--- a/php/src/file/csv/AbstractBuilder.php
+++ b/php/src/file/tab/AbstractBuilder.php
@@ -1,5 +1,5 @@
 <?php
-namespace nulib\file\csv;
+namespace nulib\file\tab;
 
 use DateTimeInterface;
 use nulib\cl;
diff --git a/php/src/file/csv/AbstractReader.php b/php/src/file/tab/AbstractReader.php
similarity index 99%
rename from php/src/file/csv/AbstractReader.php
rename to php/src/file/tab/AbstractReader.php
index cf6221a..6418235 100644
--- a/php/src/file/csv/AbstractReader.php
+++ b/php/src/file/tab/AbstractReader.php
@@ -1,5 +1,5 @@
 <?php
-namespace nulib\file\csv;
+namespace nulib\file\tab;
 
 use nulib\A;
 use nulib\php\time\Date;
diff --git a/php/src/file/csv/IBuilder.php b/php/src/file/tab/IBuilder.php
similarity index 91%
rename from php/src/file/csv/IBuilder.php
rename to php/src/file/tab/IBuilder.php
index fae647a..9cc794e 100644
--- a/php/src/file/csv/IBuilder.php
+++ b/php/src/file/tab/IBuilder.php
@@ -1,5 +1,5 @@
 <?php
-namespace nulib\file\csv;
+namespace nulib\file\tab;
 
 interface IBuilder extends \nulib\file\IReader {
   function writeHeaders(?array $headers=null): void;
diff --git a/php/src/file/csv/IReader.php b/php/src/file/tab/IReader.php
similarity index 75%
rename from php/src/file/csv/IReader.php
rename to php/src/file/tab/IReader.php
index 9d0bc41..cc683bc 100644
--- a/php/src/file/csv/IReader.php
+++ b/php/src/file/tab/IReader.php
@@ -1,5 +1,5 @@
 <?php
-namespace nulib\file\csv;
+namespace nulib\file\tab;
 
 use IteratorAggregate;
 
diff --git a/php/src/file/csv/TAbstractBuilder.php b/php/src/file/tab/TAbstractBuilder.php
similarity index 96%
rename from php/src/file/csv/TAbstractBuilder.php
rename to php/src/file/tab/TAbstractBuilder.php
index 7556a65..f12e1e0 100644
--- a/php/src/file/csv/TAbstractBuilder.php
+++ b/php/src/file/tab/TAbstractBuilder.php
@@ -1,7 +1,8 @@
 <?php
-namespace nulib\file\csv;
+namespace nulib\file\tab;
 
 use nulib\cl;
+use nulib\file\csv\CsvBuilder;
 use nulib\file\web\Upload;
 use nulib\os\path;
 use nulib\ValueException;
diff --git a/php/src/file/csv/TAbstractReader.php b/php/src/file/tab/TAbstractReader.php
similarity index 96%
rename from php/src/file/csv/TAbstractReader.php
rename to php/src/file/tab/TAbstractReader.php
index ed59776..f6037c7 100644
--- a/php/src/file/csv/TAbstractReader.php
+++ b/php/src/file/tab/TAbstractReader.php
@@ -1,7 +1,8 @@
 <?php
-namespace nulib\file\csv;
+namespace nulib\file\tab;
 
 use nulib\cl;
+use nulib\file\csv\CsvReader;
 use nulib\file\web\Upload;
 use nulib\os\path;
 use nulib\ValueException;
diff --git a/php/src/tools/BgLauncherApp.php b/php/src/tools/BgLauncherApp.php
index c3ed581..88aa522 100644
--- a/php/src/tools/BgLauncherApp.php
+++ b/php/src/tools/BgLauncherApp.php
@@ -1,15 +1,15 @@
 <?php
 namespace nulib\tools;
 
+use nulib\app;
+use nulib\app\cli\Application;
+use nulib\app\RunFile;
 use nulib\ExitError;
 use nulib\ext\yaml;
 use nulib\os\path;
 use nulib\os\proc\Cmd;
 use nulib\os\sh;
 use nulib\output\msg;
-use nulib\app;
-use nulib\app\cli\Application;
-use nulib\app\RunFile;
 
 class BgLauncherApp extends Application {
   const ACTION_INFOS = 0, ACTION_START = 1, ACTION_STOP = 2;
diff --git a/php/src/tools/SteamTrainApp.php b/php/src/tools/SteamTrainApp.php
index 3827fe4..7e00ef0 100644
--- a/php/src/tools/SteamTrainApp.php
+++ b/php/src/tools/SteamTrainApp.php
@@ -1,11 +1,11 @@
 <?php
 namespace nulib\tools;
 
+use nulib\app;
+use nulib\app\cli\Application;
 use nulib\output\msg;
 use nulib\php\time\DateTime;
 use nulib\text\words;
-use nulib\app;
-use nulib\app\cli\Application;
 
 class SteamTrainApp extends Application {
   const PROJDIR = __DIR__.'/../..';