From 1045fe1f1f8c2937f1994303b7f932e58cf89cb2 Mon Sep 17 00:00:00 2001
From: Jephte Clain <Jephte.Clain@univ-reunion.fr>
Date: Wed, 22 May 2024 20:44:20 +0400
Subject: [PATCH] deplacer file/base vers file

---
 bbnurse                               | 28 ++++++++++++++++++++++++++-
 nur_src/b/io/TmpfileWriter.php        |  2 +-
 src/file.php                          | 12 ++++++------
 src/file/{base => }/FileReader.php    |  2 +-
 src/file/{base => }/FileWriter.php    |  2 +-
 src/file/{base => }/MemoryStream.php  |  2 +-
 src/file/{base => }/SharedFile.php    |  2 +-
 src/file/{base => }/Stream.php        |  4 +---
 src/file/{base => }/TStreamFilter.php |  3 +--
 src/file/{base => }/TempStream.php    |  2 +-
 src/file/{base => }/TmpfileWriter.php |  2 +-
 src/file/{base => }/_File.php         |  2 +-
 src/file/app/LockFile.php             |  2 +-
 src/file/app/RunFile.php              |  2 +-
 src/file/web/Upload.php               |  2 +-
 src/output/_messenger.php             |  1 -
 src/output/log.php                    |  2 +-
 src/output/msg.php                    |  2 +-
 src/output/say.php                    |  2 +-
 src/output/std/StdMessenger.php       |  2 +-
 src/output/std/StdOutput.php          |  4 +---
 src/php/func.php                      |  2 +-
 src/schema/Schema.php                 |  1 -
 src/schema/_assoc/AssocSchema.php     |  2 --
 src/schema/_list/ListSchema.php       |  1 -
 src/schema/_scalar/ScalarResult.php   |  2 +-
 src/schema/_scalar/ScalarValue.php    |  5 ++---
 src/schema/types/tbool.php            |  2 +-
 src/schema/types/tfloat.php           |  1 -
 src/schema/types/tint.php             |  1 -
 src/schema/types/tstring.php          |  1 -
 src/wip/cli/ArgsParser.php            |  6 +++---
 tests/file/base/FileReaderTest.php    |  2 +-
 33 files changed, 60 insertions(+), 48 deletions(-)
 rename src/file/{base => }/FileReader.php (97%)
 rename src/file/{base => }/FileWriter.php (96%)
 rename src/file/{base => }/MemoryStream.php (94%)
 rename src/file/{base => }/SharedFile.php (92%)
 rename src/file/{base => }/Stream.php (99%)
 rename src/file/{base => }/TStreamFilter.php (95%)
 rename src/file/{base => }/TempStream.php (96%)
 rename src/file/{base => }/TmpfileWriter.php (99%)
 rename src/file/{base => }/_File.php (97%)

diff --git a/bbnurse b/bbnurse
index 07078a9..ccb687b 100755
--- a/bbnurse
+++ b/bbnurse
@@ -55,6 +55,7 @@ function copy_mature() {
         destpackage='nulib'
     fi
 
+    [ -n "$Dest" ] || Dest=.
     setx Dest=abspath "$Dest"
     if [[ "$Dest" == */nulib ]]; then
         libname=nulib
@@ -116,6 +117,31 @@ function copy_mature() {
     esac
 }
 
+function nulib_sync_mature() {
+    [ -n "$Dest" ] || Dest="$MYDIR/../nulib"
+    setx Dest=abspath "$Dest"
+    if ! [[ "$Dest" == */nulib ]]; then
+        die "seul la maturation vers nulib est autorisée"
+    fi
+    local srcdir="$MYDIR"
+    local destdir="$Dest/php"
+    local -a srcs src srcname dest
+
+    estep "Synchronisation des fichiers"
+    rsync -a "$srcdir/src/" "$destdir/src/" --exclude /wip/ --delete
+    rsync -a "$srcdir/tests/" "$destdir/tests/" --exclude /wip/ --delete
+
+    estep "Mise à jour des packages"
+    setx -a dests=find "$destdir/src/" -type f
+    for dest in "${dests[@]}"; do
+        sed -i 's|nur\\sery|nulib|g' "$dest"
+    done
+    setx -a dests=find "$destdir/tests/" -type f
+    for dest in "${dests[@]}"; do
+        sed -i 's|nur\\sery|nulib|g' "$dest"
+    done
+}
+
 function update_nurse() {
     :
 }
@@ -161,8 +187,8 @@ Pour chaque type d'évolution, il y a deux actions possibles:
     -u,--update action=update "Mettre à jour un projet. C'est l'option par défaut"
     -i,-n,--nurse evolution=nurse "Mettre en nurserie"
     -x,-m,--mature evolution=mature "Arriver à maturation. C'est l'option par défaut"
+    --sm '$action=nulib_sync; evolution=mature' "Maturation complète vers nulib. Equivalent à '-cm nur/sery -d ../nulib' mais omet le package nur\\sery\\wip"
 )
 parse_args "$@"; set -- "${args[@]}"
 
-[ -n "$Dest" ] || Dest=.
 "${action}_${evolution}" "$@"
diff --git a/nur_src/b/io/TmpfileWriter.php b/nur_src/b/io/TmpfileWriter.php
index d24588d..4f95ed7 100644
--- a/nur_src/b/io/TmpfileWriter.php
+++ b/nur_src/b/io/TmpfileWriter.php
@@ -1,7 +1,7 @@
 <?php
 namespace nur\b\io;
 
-use nur\sery\file\base\FileReader;
+use nur\sery\file\FileReader;
 use nur\v\http;
 
 /**
diff --git a/src/file.php b/src/file.php
index b296cfa..ed6462f 100644
--- a/src/file.php
+++ b/src/file.php
@@ -1,12 +1,12 @@
 <?php
 namespace nur\sery;
 
-use nur\sery\file\base\FileReader;
-use nur\sery\file\base\FileWriter;
-use nur\sery\file\base\MemoryStream;
-use nur\sery\file\base\SharedFile;
-use nur\sery\file\base\TempStream;
-use nur\sery\file\base\TmpfileWriter;
+use nur\sery\file\FileReader;
+use nur\sery\file\FileWriter;
+use nur\sery\file\MemoryStream;
+use nur\sery\file\SharedFile;
+use nur\sery\file\TempStream;
+use nur\sery\file\TmpfileWriter;
 
 /**
  * Class file: outils pour gérer les fichiers
diff --git a/src/file/base/FileReader.php b/src/file/FileReader.php
similarity index 97%
rename from src/file/base/FileReader.php
rename to src/file/FileReader.php
index 717d8cf..ec99dba 100644
--- a/src/file/base/FileReader.php
+++ b/src/file/FileReader.php
@@ -1,5 +1,5 @@
 <?php
-namespace nur\sery\file\base;
+namespace nur\sery\file;
 
 /**
  * Class FileReader: un fichier accédé en lecture
diff --git a/src/file/base/FileWriter.php b/src/file/FileWriter.php
similarity index 96%
rename from src/file/base/FileWriter.php
rename to src/file/FileWriter.php
index b4c78f8..8ffed2f 100644
--- a/src/file/base/FileWriter.php
+++ b/src/file/FileWriter.php
@@ -1,5 +1,5 @@
 <?php
-namespace nur\sery\file\base;
+namespace nur\sery\file;
 
 use nur\sery\os\IOException;
 use nur\sery\os\sh;
diff --git a/src/file/base/MemoryStream.php b/src/file/MemoryStream.php
similarity index 94%
rename from src/file/base/MemoryStream.php
rename to src/file/MemoryStream.php
index 46f2c94..d4743a0 100644
--- a/src/file/base/MemoryStream.php
+++ b/src/file/MemoryStream.php
@@ -1,5 +1,5 @@
 <?php
-namespace nur\sery\file\base;
+namespace nur\sery\file;
 
 /**
  * Class MemoryStream: un flux qui peut être lu ou écrit, et qui reste
diff --git a/src/file/base/SharedFile.php b/src/file/SharedFile.php
similarity index 92%
rename from src/file/base/SharedFile.php
rename to src/file/SharedFile.php
index 738a251..856eb86 100644
--- a/src/file/base/SharedFile.php
+++ b/src/file/SharedFile.php
@@ -1,5 +1,5 @@
 <?php
-namespace nur\sery\file\base;
+namespace nur\sery\file;
 
 use nur\sery\ValueException;
 
diff --git a/src/file/base/Stream.php b/src/file/Stream.php
similarity index 99%
rename from src/file/base/Stream.php
rename to src/file/Stream.php
index e83a5ab..6d26b9f 100644
--- a/src/file/base/Stream.php
+++ b/src/file/Stream.php
@@ -1,9 +1,7 @@
 <?php
-namespace nur\sery\file\base;
+namespace nur\sery\file;
 
 use nur\sery\file\csv\csv_flavours;
-use nur\sery\file\IReader;
-use nur\sery\file\IWriter;
 use nur\sery\NoMoreDataException;
 use nur\sery\os\EOFException;
 use nur\sery\os\IOException;
diff --git a/src/file/base/TStreamFilter.php b/src/file/TStreamFilter.php
similarity index 95%
rename from src/file/base/TStreamFilter.php
rename to src/file/TStreamFilter.php
index 4fe3def..d2b386e 100644
--- a/src/file/base/TStreamFilter.php
+++ b/src/file/TStreamFilter.php
@@ -1,7 +1,6 @@
 <?php
-namespace nur\sery\file\base;
+namespace nur\sery\file;
 
-use nur\sery\file\_IFile;
 use nur\sery\os\IOException;
 
 trait TStreamFilter {
diff --git a/src/file/base/TempStream.php b/src/file/TempStream.php
similarity index 96%
rename from src/file/base/TempStream.php
rename to src/file/TempStream.php
index bb1f1dd..f0d8e4a 100644
--- a/src/file/base/TempStream.php
+++ b/src/file/TempStream.php
@@ -1,5 +1,5 @@
 <?php
-namespace nur\sery\file\base;
+namespace nur\sery\file;
 
 /**
  * Class TempStream: un flux qui peut être lu ou écrit, et qui reste en mémoire,
diff --git a/src/file/base/TmpfileWriter.php b/src/file/TmpfileWriter.php
similarity index 99%
rename from src/file/base/TmpfileWriter.php
rename to src/file/TmpfileWriter.php
index 3c78990..bf90516 100644
--- a/src/file/base/TmpfileWriter.php
+++ b/src/file/TmpfileWriter.php
@@ -1,5 +1,5 @@
 <?php
-namespace nur\sery\file\base;
+namespace nur\sery\file;
 
 use nur\sery\os\IOException;
 use nur\sery\os\path;
diff --git a/src/file/base/_File.php b/src/file/_File.php
similarity index 97%
rename from src/file/base/_File.php
rename to src/file/_File.php
index b9a0710..9efe059 100644
--- a/src/file/base/_File.php
+++ b/src/file/_File.php
@@ -1,5 +1,5 @@
 <?php
-namespace nur\sery\file\base;
+namespace nur\sery\file;
 
 use nur\sery\os\IOException;
 use nur\sery\web\http;
diff --git a/src/file/app/LockFile.php b/src/file/app/LockFile.php
index 67b4cab..a5f0ecd 100644
--- a/src/file/app/LockFile.php
+++ b/src/file/app/LockFile.php
@@ -2,7 +2,7 @@
 namespace nur\sery\file\app;
 
 use nur\sery\cl;
-use nur\sery\file\base\SharedFile;
+use nur\sery\file\SharedFile;
 use nur\sery\output\msg;
 use nur\sery\php\time\DateTime;
 
diff --git a/src/file/app/RunFile.php b/src/file/app/RunFile.php
index 34c90b1..6dee6ba 100644
--- a/src/file/app/RunFile.php
+++ b/src/file/app/RunFile.php
@@ -2,7 +2,7 @@
 namespace nur\sery\file\app;
 
 use nur\sery\cl;
-use nur\sery\file\base\SharedFile;
+use nur\sery\file\SharedFile;
 use nur\sery\os\path;
 use nur\sery\php\time\DateTime;
 use nur\sery\str;
diff --git a/src/file/web/Upload.php b/src/file/web/Upload.php
index 949c691..e47ba29 100644
--- a/src/file/web/Upload.php
+++ b/src/file/web/Upload.php
@@ -1,7 +1,7 @@
 <?php
 namespace nur\sery\file\web;
 
-use nur\sery\file\base\FileReader;
+use nur\sery\file\FileReader;
 use nur\sery\php\coll\BaseArray;
 use nur\sery\ValueException;
 
diff --git a/src/output/_messenger.php b/src/output/_messenger.php
index 2fc26ca..e24ed09 100644
--- a/src/output/_messenger.php
+++ b/src/output/_messenger.php
@@ -2,7 +2,6 @@
 namespace nur\sery\output;
 
 use nur\sery\str;
-use nur\sery\ValueException;
 
 /**
  * Class _messenger: classe de base pour say, log et msg
diff --git a/src/output/log.php b/src/output/log.php
index 51b261f..3b4bab6 100644
--- a/src/output/log.php
+++ b/src/output/log.php
@@ -2,8 +2,8 @@
 namespace nur\sery\output;
 
 use nur\sery\cl;
-use nur\sery\ValueException;
 use nur\sery\output\std\ProxyMessenger;
+use nur\sery\ValueException;
 
 /**
  * Class log: inscrire un message dans les logs uniquement
diff --git a/src/output/msg.php b/src/output/msg.php
index 140985b..7ba5f77 100644
--- a/src/output/msg.php
+++ b/src/output/msg.php
@@ -1,8 +1,8 @@
 <?php
 namespace nur\sery\output;
 
-use nur\sery\ValueException;
 use nur\sery\output\std\ProxyMessenger;
+use nur\sery\ValueException;
 
 /**
  * Class msg: inscrire un message dans les logs ET l'afficher sur la console
diff --git a/src/output/say.php b/src/output/say.php
index 44ea239..6bf13e2 100644
--- a/src/output/say.php
+++ b/src/output/say.php
@@ -1,8 +1,8 @@
 <?php
 namespace nur\sery\output;
 
-use nur\sery\ValueException;
 use nur\sery\output\std\ProxyMessenger;
+use nur\sery\ValueException;
 
 /**
  * Class say: afficher un message sur la console uniquement
diff --git a/src/output/std/StdMessenger.php b/src/output/std/StdMessenger.php
index fd2ba12..8c98649 100644
--- a/src/output/std/StdMessenger.php
+++ b/src/output/std/StdMessenger.php
@@ -5,8 +5,8 @@ use Exception;
 use nur\sery\A;
 use nur\sery\cl;
 use nur\sery\ExceptionShadow;
-use nur\sery\UserException;
 use nur\sery\output\IMessenger;
+use nur\sery\UserException;
 use Throwable;
 
 class StdMessenger implements _IMessenger {
diff --git a/src/output/std/StdOutput.php b/src/output/std/StdOutput.php
index ba541a4..7790b9c 100644
--- a/src/output/std/StdOutput.php
+++ b/src/output/std/StdOutput.php
@@ -3,10 +3,8 @@ namespace nur\sery\output\std;
 
 use Exception;
 use nur\sery\cl;
-use nur\sery\file\base\Stream;
+use nur\sery\file\Stream;
 use nur\sery\php\content\content;
-use nur\sery\php\content\IContent;
-use nur\sery\php\content\IPrintable;
 
 /**
  * Class StdOutput: affichage sur STDOUT, STDERR ou dans un fichier quelconque
diff --git a/src/php/func.php b/src/php/func.php
index 38ba864..10e3198 100644
--- a/src/php/func.php
+++ b/src/php/func.php
@@ -3,9 +3,9 @@ namespace nur\sery\php;
 
 use Closure;
 use nur\sery\cl;
-use nur\sery\ValueException;
 use nur\sery\ref\php\ref_func;
 use nur\sery\schema\Schema;
+use nur\sery\ValueException;
 use ReflectionClass;
 use ReflectionFunction;
 use ReflectionMethod;
diff --git a/src/schema/Schema.php b/src/schema/Schema.php
index 0f9458b..15306b5 100644
--- a/src/schema/Schema.php
+++ b/src/schema/Schema.php
@@ -2,7 +2,6 @@
 namespace nur\sery\schema;
 
 use ArrayAccess;
-use LogicException;
 use nur\sery\AccessException;
 use nur\sery\cl;
 use nur\sery\schema\_assoc\AssocSchema;
diff --git a/src/schema/_assoc/AssocSchema.php b/src/schema/_assoc/AssocSchema.php
index 3a9365a..2d01f0d 100644
--- a/src/schema/_assoc/AssocSchema.php
+++ b/src/schema/_assoc/AssocSchema.php
@@ -3,8 +3,6 @@ namespace nur\sery\schema\_assoc;
 
 use nur\sery\cl;
 use nur\sery\ref\schema\ref_schema;
-use nur\sery\schema\_scalar\ScalarValue;
-use nur\sery\schema\input\Input;
 use nur\sery\schema\Schema;
 use nur\sery\schema\Value;
 
diff --git a/src/schema/_list/ListSchema.php b/src/schema/_list/ListSchema.php
index ff273e8..b91b9f8 100644
--- a/src/schema/_list/ListSchema.php
+++ b/src/schema/_list/ListSchema.php
@@ -2,7 +2,6 @@
 namespace nur\sery\schema\_list;
 
 use nur\sery\ref\schema\ref_schema;
-use nur\sery\schema\_assoc\AssocValue;
 use nur\sery\schema\Schema;
 use nur\sery\schema\Value;
 
diff --git a/src/schema/_scalar/ScalarResult.php b/src/schema/_scalar/ScalarResult.php
index f4e07ef..2eea749 100644
--- a/src/schema/_scalar/ScalarResult.php
+++ b/src/schema/_scalar/ScalarResult.php
@@ -2,10 +2,10 @@
 namespace nur\sery\schema\_scalar;
 
 use nur\sery\cl;
-use nur\sery\ValueException;
 use nur\sery\ref\schema\ref_analyze;
 use nur\sery\ref\schema\ref_schema;
 use nur\sery\schema\Result;
+use nur\sery\ValueException;
 
 /**
  * Class ScalarResult: résultat de l'analyse ou de la normalisation d'une valeur
diff --git a/src/schema/_scalar/ScalarValue.php b/src/schema/_scalar/ScalarValue.php
index 22b4ce6..9a8b375 100644
--- a/src/schema/_scalar/ScalarValue.php
+++ b/src/schema/_scalar/ScalarValue.php
@@ -1,13 +1,12 @@
 <?php
 namespace nur\sery\schema\_scalar;
 
-use nur\sery\ValueException;
-use nur\sery\schema\input\Input;
 use nur\sery\ref\schema\ref_analyze;
-use nur\sery\schema\Result;
+use nur\sery\schema\input\Input;
 use nur\sery\schema\types;
 use nur\sery\schema\types\IType;
 use nur\sery\schema\Value;
+use nur\sery\ValueException;
 
 class ScalarValue extends Value {
   function __construct(ScalarSchema $schema, &$dest=null, $destKey=null, bool $defaultVerifix=true, ?bool $defaultThrow=null) {
diff --git a/src/schema/types/tbool.php b/src/schema/types/tbool.php
index 4461aa9..a81f3f2 100644
--- a/src/schema/types/tbool.php
+++ b/src/schema/types/tbool.php
@@ -2,12 +2,12 @@
 namespace nur\sery\schema\types;
 
 use nur\sery\cl;
-use nur\sery\ValueException;
 use nur\sery\schema\_scalar\ScalarResult;
 use nur\sery\schema\_scalar\ScalarSchema;
 use nur\sery\schema\input\Input;
 use nur\sery\schema\Result;
 use nur\sery\schema\Schema;
+use nur\sery\ValueException;
 
 class tbool extends _tsimple {
   /** liste de valeurs chaines à considérer comme 'OUI' */
diff --git a/src/schema/types/tfloat.php b/src/schema/types/tfloat.php
index 165ca41..db6dd5d 100644
--- a/src/schema/types/tfloat.php
+++ b/src/schema/types/tfloat.php
@@ -3,7 +3,6 @@ namespace nur\sery\schema\types;
 
 use nur\sery\schema\_scalar\ScalarResult;
 use nur\sery\schema\_scalar\ScalarSchema;
-use nur\sery\schema\input\Input;
 use nur\sery\schema\Result;
 use nur\sery\schema\Schema;
 
diff --git a/src/schema/types/tint.php b/src/schema/types/tint.php
index 8fc6746..26e447b 100644
--- a/src/schema/types/tint.php
+++ b/src/schema/types/tint.php
@@ -3,7 +3,6 @@ namespace nur\sery\schema\types;
 
 use nur\sery\schema\_scalar\ScalarResult;
 use nur\sery\schema\_scalar\ScalarSchema;
-use nur\sery\schema\input\Input;
 use nur\sery\schema\Result;
 use nur\sery\schema\Schema;
 
diff --git a/src/schema/types/tstring.php b/src/schema/types/tstring.php
index f552a04..57dadfe 100644
--- a/src/schema/types/tstring.php
+++ b/src/schema/types/tstring.php
@@ -3,7 +3,6 @@ namespace nur\sery\schema\types;
 
 use nur\sery\schema\_scalar\ScalarResult;
 use nur\sery\schema\_scalar\ScalarSchema;
-use nur\sery\schema\input\Input;
 use nur\sery\schema\Result;
 use nur\sery\schema\Schema;
 
diff --git a/src/wip/cli/ArgsParser.php b/src/wip/cli/ArgsParser.php
index f659189..cfb7f79 100644
--- a/src/wip/cli/ArgsParser.php
+++ b/src/wip/cli/ArgsParser.php
@@ -1,13 +1,13 @@
 <?php
 namespace nur\sery\wip\cli;
 
-use nur\sery\str;
 use nur\A;
-use nur\sery\php\func;
-use nur\sery\ref\cli\ref_args;
 use nur\sery\php\akey;
+use nur\sery\php\func;
 use nur\sery\php\oprop;
 use nur\sery\php\valx;
+use nur\sery\ref\cli\ref_args;
+use nur\sery\str;
 use stdClass;
 
 /**
diff --git a/tests/file/base/FileReaderTest.php b/tests/file/base/FileReaderTest.php
index d27673e..1066468 100644
--- a/tests/file/base/FileReaderTest.php
+++ b/tests/file/base/FileReaderTest.php
@@ -1,7 +1,7 @@
 <?php
 namespace nur\sery\file\base;
 
-use nur\sery\file\base\FileReader;
+use nur\sery\file\FileReader;
 use PHPUnit\Framework\TestCase;
 
 class FileReaderTest extends TestCase {