déplacer nur/sery/wip et nur/sery dans nulib

.idea/nur-ture.iml

@@ -4,10 +4,8 @@
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/nur_src" isTestSource="false" packagePrefix="nur\" />
       <sourceFolder url="file://$MODULE_DIR$/nur_tests" isTestSource="true" packagePrefix="nur\" />
-      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" packagePrefix="nur\sery\wip\" />
-      <sourceFolder url="file://$MODULE_DIR$/src_app" isTestSource="false" packagePrefix="nur\sery\" />
-      <sourceFolder url="file://$MODULE_DIR$/tests" isTestSource="true" packagePrefix="nur\sery\" />
-      <sourceFolder url="file://$MODULE_DIR$/src_glue" isTestSource="false" packagePrefix="nulib\" />
+      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" packagePrefix="nulib\" />
+      <sourceFolder url="file://$MODULE_DIR$/tests" isTestSource="true" packagePrefix="nulib\" />
       <excludeFolder url="file://$MODULE_DIR$/vendor" />
     </content>
     <orderEntry type="inheritedJdk" />

composer.json

@@ -64,9 +64,7 @@
 	},
 	"autoload": {
 		"psr-4": {
-			"nulib\\": "src_glue",
-			"nur\\sery\\wip\\": "src",
-			"nur\\sery\\": "src_app",
+			"nulib\\": "src",
 			"nur\\": "nur_src"
 		},
 		"files": [
@@ -75,7 +73,7 @@
 	},
 	"autoload-dev": {
 		"psr-4": {
-			"nur\\sery\\": "tests",
+			"nulib\\": "tests",
 			"nur\\": "nur_tests"
 		}
 	},

composer.lock

@@ -589,7 +589,7 @@
             "dist": {
                 "type": "path",
                 "url": "../nulib",
-                "reference": "2cdc05981013dc403afe26c08f3cfef36f737642"
+                "reference": "1536e091fb0020858204f59462a7a80b5f9775d9"
             },
             "require": {
                 "ext-json": "*",

nur_bin/steam-train.php

@@ -2,6 +2,6 @@
 <?php
 require $_composer_autoload_path?? __DIR__.'/../vendor/autoload.php';
 
-use nur\sery\tools\SteamTrainApp;
+use nulib\tools\SteamTrainApp;
 
 SteamTrainApp::run();

nur_src/cli/Application.php

@@ -2,6 +2,7 @@
 namespace nur\cli;
 
 use Exception;
+use nulib\app;
 use nulib\app\RunFile;
 use nulib\ExitError;
 use nulib\ext\yaml;
@@ -16,7 +17,6 @@ use nur\config\ArrayConfig;
 use nur\msg;
 use nur\os;
 use nur\path;
-use nur\sery\app;
 
 /**
  * Class Application: application de base

nur_src/ref/ref_type.php

@@ -105,7 +105,7 @@ class ref_type {
   /** comme {@link c} mais nullable */
   const NCONTENT = "?".self::CONTENT;
 
-  /** comme {@link \nur\sery\FILE} mais nullable */
+  /** comme {@link FILE} mais nullable */
   const NFILE = "?".self::FILE;
 
   /** comme {@link DATETIME} mais nullable */

nur_tbin/base/test-args4.php

@@ -2,7 +2,7 @@
 require(__DIR__.'/../../vendor/autoload.php');
 
 use nur\cli\Application;
-use nur\sery\output\msg;
+use nulib\output\msg;
 
 class TestArgs4 extends Application {
   protected $query;

src/app.php

@@ -1,5 +1,5 @@
 <?php
-namespace nur\sery;
+namespace nulib;
 
 use nulib\A;
 use nulib\app\LockFile;
@@ -12,7 +12,7 @@ use nulib\php\func;
 use nulib\str;
 use nulib\ValueException;
 use nur\cli\Application as nur_Application;
-use nur\sery\app\cli\Application;
+use nulib\app\cli\Application;
 
 class app {
   private static function isa_Application($app): bool {

src/app/cli/Application.php

@@ -1,5 +1,5 @@
 <?php
-namespace nur\sery\app\cli;
+namespace nulib\app\cli;
 
 use Exception;
 use nulib\app\RunFile;
@@ -13,7 +13,7 @@ use nulib\ValueException;
 use nur\cli\ArgsException;
 use nur\cli\ArgsParser;
 use nur\config;
-use nur\sery\app;
+use nulib\app;
 
 /**
  * Class Application: application de base

src/php/access/AbstractAccess.php

@@ -1,5 +1,5 @@
 <?php
-namespace nur\sery\wip\php\access;
+namespace nulib\php\access;
 
 use nulib\cl;
 

src/php/access/ArrayAccess.php

@@ -1,5 +1,5 @@
 <?php
-namespace nur\sery\wip\php\access;
+namespace nulib\php\access;
 
 class ArrayAccess extends KeyAccess {
   const ALLOW_NULL = true;

src/php/access/ChainAccess.php

@@ -1,5 +1,5 @@
 <?php
-namespace nur\sery\wip\php\access;
+namespace nulib\php\access;
 
 use nulib\cl;
 use nulib\StateException;

src/php/access/FormAccess.php

@@ -1,5 +1,5 @@
 <?php
-namespace nur\sery\wip\php\access;
+namespace nulib\php\access;
 
 use nulib\cl;
 

src/php/access/GetAccess.php

@@ -1,5 +1,5 @@
 <?php
-namespace nur\sery\wip\php\access;
+namespace nulib\php\access;
 
 use nulib\cl;
 

src/php/access/IAccess.php

@@ -1,5 +1,5 @@
 <?php
-namespace nur\sery\wip\php\access;
+namespace nulib\php\access;
 
 use ReflectionClass;
 

src/php/access/IDeleter.php

@@ -1,5 +1,5 @@
 <?php
-namespace nur\sery\wip\php\access;
+namespace nulib\php\access;
 
 /**
  * Class IDeleter: une abstraction d'un objet qui permet de supprimer une valeur

src/php/access/IGetter.php

@@ -1,5 +1,5 @@
 <?php
-namespace nur\sery\wip\php\access;
+namespace nulib\php\access;
 
 /**
  * Class IGetter: une abstraction d'un objet qui permet d'obtenir une valeur

src/php/access/ISetter.php

@@ -1,5 +1,5 @@
 <?php
-namespace nur\sery\wip\php\access;
+namespace nulib\php\access;
 
 /**
  * Class ISetter: une abstraction d'un objet qui permet de modifier une valeur

src/php/access/KeyAccess.php

@@ -1,5 +1,5 @@
 <?php
-namespace nur\sery\wip\php\access;
+namespace nulib\php\access;
 
 use ArrayAccess;
 use nulib\cl;

src/php/access/PostAccess.php

@@ -1,5 +1,5 @@
 <?php
-namespace nur\sery\wip\php\access;
+namespace nulib\php\access;
 
 use nulib\cl;
 

src/php/access/PropertyAccess.php

@@ -1,5 +1,5 @@
 <?php
-namespace nur\sery\wip\php\access;
+namespace nulib\php\access;
 
 use nulib\StateException;
 use nulib\str;

src/php/access/ShadowAccess.php

@@ -1,5 +1,5 @@
 <?php
-namespace nur\sery\wip\php\access;
+namespace nulib\php\access;
 
 /**
  * Class ShadowAccess: accès en lecture depuis une instance de {@link IAccess}

src/php/access/ValueAccess.php

@@ -1,5 +1,5 @@
 <?php
-namespace nur\sery\wip\php\access;
+namespace nulib\php\access;
 
 class ValueAccess extends KeyAccess {
   const ALLOW_NULL = false;

src/php/coll/Cursor.php

@@ -1,11 +1,11 @@
 <?php
-namespace nur\sery\wip\php\coll;
+namespace nulib\php\coll;
 
 use Iterator;
 use IteratorAggregate;
 use nulib\cl;
 use nulib\php\func;
-use nur\sery\wip\php\iter;
+use nulib\php\iter;
 use Traversable;
 
 /**

src/php/iter.php

@@ -1,5 +1,5 @@
 <?php # -*- coding: utf-8 mode: php -*- vim:sw=2:sts=2:et:ai:si:sta:fenc=utf-8
-namespace nur\sery\wip\php;
+namespace nulib\php;
 
 use Exception;
 use Generator;

src/schema/OldSchema.php

@@ -1,5 +1,5 @@
 <?php
-namespace nur\sery\wip\schema;
+namespace nulib\schema;
 
 class OldSchema {
   /**

src/schema/Result.php

@@ -1,5 +1,5 @@
 <?php
-namespace nur\sery\wip\schema;
+namespace nulib\schema;
 
 use IteratorAggregate;
 use Throwable;

src/schema/Schema.php

@@ -1,21 +1,21 @@
 <?php
-namespace nur\sery\wip\schema;
+namespace nulib\schema;
 
 use ArrayAccess;
 use nulib\AccessException;
 use nulib\cl;
 use nulib\ref\schema\ref_schema;
 use nulib\ref\schema\ref_types;
-use nur\sery\wip\schema\_assoc\AssocSchema;
-use nur\sery\wip\schema\_list\ListSchema;
-use nur\sery\wip\schema\_scalar\ScalarSchema;
-use nur\sery\wip\schema\types\IType;
-use nur\sery\wip\schema\types\tarray;
-use nur\sery\wip\schema\types\tbool;
-use nur\sery\wip\schema\types\tfunc;
-use nur\sery\wip\schema\types\tcontent;
-use nur\sery\wip\schema\types\tpkey;
-use nur\sery\wip\schema\types\trawstring;
+use nulib\schema\_assoc\AssocSchema;
+use nulib\schema\_list\ListSchema;
+use nulib\schema\_scalar\ScalarSchema;
+use nulib\schema\types\IType;
+use nulib\schema\types\tarray;
+use nulib\schema\types\tbool;
+use nulib\schema\types\tfunc;
+use nulib\schema\types\tcontent;
+use nulib\schema\types\tpkey;
+use nulib\schema\types\trawstring;
 
 /**
  * Class Schema

src/schema/SchemaException.php

@@ -1,5 +1,5 @@
 <?php
-namespace nur\sery\wip\schema;
+namespace nulib\schema;
 
 use Exception;
 

src/schema/Wrapper.php

@@ -1,15 +1,15 @@
 <?php
-namespace nur\sery\wip\schema;
+namespace nulib\schema;
 
 use ArrayAccess;
 use IteratorAggregate;
 use nulib\php\func;
-use nur\sery\wip\schema\_assoc\AssocWrapper;
-use nur\sery\wip\schema\_list\ListWrapper;
-use nur\sery\wip\schema\_scalar\ScalarResult;
-use nur\sery\wip\schema\_scalar\ScalarWrapper;
-use nur\sery\wip\schema\input\Input;
-use nur\sery\wip\schema\types\IType;
+use nulib\schema\_assoc\AssocWrapper;
+use nulib\schema\_list\ListWrapper;
+use nulib\schema\_scalar\ScalarResult;
+use nulib\schema\_scalar\ScalarWrapper;
+use nulib\schema\input\Input;
+use nulib\schema\types\IType;
 
 abstract class Wrapper implements ArrayAccess, IteratorAggregate {
   protected WrapperContext $context;

src/schema/WrapperContext.php

@@ -1,9 +1,9 @@
 <?php
-namespace nur\sery\wip\schema;
+namespace nulib\schema;
 
 use nulib\ref\schema\ref_schema;
-use nur\sery\wip\schema\input\Input;
-use nur\sery\wip\schema\types\IType;
+use nulib\schema\input\Input;
+use nulib\schema\types\IType;
 
 class WrapperContext {
 

src/schema/_assoc/AssocSchema.php

@@ -1,11 +1,11 @@
 <?php
-namespace nur\sery\wip\schema\_assoc;
+namespace nulib\schema\_assoc;
 
 use nulib\cl;
 use nulib\ref\schema\ref_schema;
 use nulib\ValueException;
-use nur\sery\wip\schema\Schema;
-use nur\sery\wip\schema\Wrapper;
+use nulib\schema\Schema;
+use nulib\schema\Wrapper;
 
 /**
  * Class AssocSchema

src/schema/_assoc/AssocWrapper.php

@@ -1,16 +1,16 @@
 <?php
-namespace nur\sery\wip\schema\_assoc;
+namespace nulib\schema\_assoc;
 
 use nulib\cl;
 use nulib\ref\schema\ref_analyze;
 use nulib\ValueException;
-use nur\sery\wip\schema\_scalar\ScalarResult;
-use nur\sery\wip\schema\_scalar\ScalarWrapper;
-use nur\sery\wip\schema\input\Input;
-use nur\sery\wip\schema\Result;
-use nur\sery\wip\schema\types\IType;
-use nur\sery\wip\schema\Wrapper;
-use nur\sery\wip\schema\WrapperContext;
+use nulib\schema\_scalar\ScalarResult;
+use nulib\schema\_scalar\ScalarWrapper;
+use nulib\schema\input\Input;
+use nulib\schema\Result;
+use nulib\schema\types\IType;
+use nulib\schema\Wrapper;
+use nulib\schema\WrapperContext;
 
 class AssocWrapper extends Wrapper {
   function __construct(AssocSchema $schema, &$value=null, $valueKey=null, ?array $params=null) {

src/schema/_assoc/AssocWrapperContext.php

@@ -1,10 +1,10 @@
 <?php
-namespace nur\sery\wip\schema\_assoc;
+namespace nulib\schema\_assoc;
 
 use nulib\ref\schema\ref_schema;
-use nur\sery\wip\schema\_scalar\ScalarWrapper;
-use nur\sery\wip\schema\Wrapper;
-use nur\sery\wip\schema\WrapperContext;
+use nulib\schema\_scalar\ScalarWrapper;
+use nulib\schema\Wrapper;
+use nulib\schema\WrapperContext;
 
 class AssocWrapperContext extends WrapperContext {
 

src/schema/_list/ListResult.php

@@ -1,8 +1,8 @@
 <?php
-namespace nur\sery\wip\schema\_list;
+namespace nulib\schema\_list;
 
 use nulib\ValueException;
-use nur\sery\wip\schema\Result;
+use nulib\schema\Result;
 
 class ListResult extends Result {
   function __construct(Result $arrayResult, array &$keyResults) {

src/schema/_list/ListSchema.php

@@ -1,10 +1,10 @@
 <?php
-namespace nur\sery\wip\schema\_list;
+namespace nulib\schema\_list;
 
 use nulib\ref\schema\ref_schema;
 use nulib\ValueException;
-use nur\sery\wip\schema\Schema;
-use nur\sery\wip\schema\Wrapper;
+use nulib\schema\Schema;
+use nulib\schema\Wrapper;
 
 class ListSchema extends Schema {
   /** @var array meta-schema d'un schéma de nature liste */

src/schema/_list/ListWrapper.php

@@ -1,8 +1,8 @@
 <?php
-namespace nur\sery\wip\schema\_list;
+namespace nulib\schema\_list;
 
-use nur\sery\wip\schema\Result;
-use nur\sery\wip\schema\Wrapper;
+use nulib\schema\Result;
+use nulib\schema\Wrapper;
 
 abstract/*XXX*/ class ListWrapper extends Wrapper {
   function ensureKeys(): bool {

src/schema/_scalar/ScalarResult.php

@@ -1,13 +1,13 @@
 <?php
-namespace nur\sery\wip\schema\_scalar;
+namespace nulib\schema\_scalar;
 
 use nulib\cl;
 use nulib\ref\schema\ref_analyze;
 use nulib\ref\schema\ref_schema;
 use nulib\ValueException;
-use nur\sery\wip\schema\Result;
-use nur\sery\wip\schema\Schema;
-use nur\sery\wip\schema\Wrapper;
+use nulib\schema\Result;
+use nulib\schema\Schema;
+use nulib\schema\Wrapper;
 use Throwable;
 
 /**

src/schema/_scalar/ScalarSchema.php

@@ -1,11 +1,11 @@
 <?php
-namespace nur\sery\wip\schema\_scalar;
+namespace nulib\schema\_scalar;
 
 use nulib\cl;
 use nulib\ref\schema\ref_schema;
 use nulib\ValueException;
-use nur\sery\wip\schema\Schema;
-use nur\sery\wip\schema\Wrapper;
+use nulib\schema\Schema;
+use nulib\schema\Wrapper;
 
 /**
  * Class ScalarSchema

src/schema/_scalar/ScalarWrapper.php

@@ -1,14 +1,14 @@
 <?php
-namespace nur\sery\wip\schema\_scalar;
+namespace nulib\schema\_scalar;
 
 use nulib\php\func;
 use nulib\ref\schema\ref_analyze;
 use nulib\ValueException;
-use nur\sery\wip\schema\Schema;
-use nur\sery\wip\schema\types;
-use nur\sery\wip\schema\types\IType;
-use nur\sery\wip\schema\Wrapper;
-use nur\sery\wip\schema\WrapperContext;
+use nulib\schema\Schema;
+use nulib\schema\types;
+use nulib\schema\types\IType;
+use nulib\schema\Wrapper;
+use nulib\schema\WrapperContext;
 
 /**
  * Class ScalarWrapper

src/schema/input/FormInput.php

@@ -1,11 +1,11 @@
 <?php
-namespace nur\sery\wip\schema\input;
+namespace nulib\schema\input;
 
 #XXX implémenter le renommage de paramètres et faire des méthodes pour
 # construire des querystring et paramètres de formulaires
-use nur\sery\wip\php\access\FormAccess;
-use nur\sery\wip\php\access\IAccess;
-use nur\sery\wip\php\access\ShadowAccess;
+use nulib\php\access\FormAccess;
+use nulib\php\access\IAccess;
+use nulib\php\access\ShadowAccess;
 
 /**
  * Class FormInput: accès à des paramètres de formulaire (POST ou GET, dans cet

src/schema/input/GetInput.php

@@ -1,8 +1,8 @@
 <?php
-namespace nur\sery\wip\schema\input;
+namespace nulib\schema\input;
 
-use nur\sery\wip\php\access\GetAccess;
-use nur\sery\wip\php\access\IAccess;
+use nulib\php\access\GetAccess;
+use nulib\php\access\IAccess;
 
 /**
  * Class GetInput: accès à des paramètres de formulaire de type GET uniquement

src/schema/input/Input.php

@@ -1,11 +1,11 @@
 <?php
-namespace nur\sery\wip\schema\input;
+namespace nulib\schema\input;
 
 use nulib\ref\schema\ref_input;
 use nulib\StateException;
-use nur\sery\wip\php\access\IAccess;
-use nur\sery\wip\php\access\KeyAccess;
-use nur\sery\wip\php\access\PropertyAccess;
+use nulib\php\access\IAccess;
+use nulib\php\access\KeyAccess;
+use nulib\php\access\PropertyAccess;
 
 /**
  * Class Input: accès à une valeur

src/schema/input/PostInput.php

@@ -1,8 +1,8 @@
 <?php
-namespace nur\sery\wip\schema\input;
+namespace nulib\schema\input;
 
-use nur\sery\wip\php\access\IAccess;
-use nur\sery\wip\php\access\PostAccess;
+use nulib\php\access\IAccess;
+use nulib\php\access\PostAccess;
 
 /**
  * Class PostInput: accès à des paramètres de formulaire de type POST uniquement

src/schema/types.php

@@ -1,22 +1,22 @@
 <?php
-namespace nur\sery\wip\schema;
+namespace nulib\schema;
 
 use nulib\ValueException;
-use nur\sery\wip\schema\types\IType;
-use nur\sery\wip\schema\types\Registry;
-use nur\sery\wip\schema\types\tarray;
-use nur\sery\wip\schema\types\tbool;
-use nur\sery\wip\schema\types\tfunc;
-use nur\sery\wip\schema\types\tcontent;
-use nur\sery\wip\schema\types\tfloat;
-use nur\sery\wip\schema\types\tint;
-use nur\sery\wip\schema\types\tkey;
-use nur\sery\wip\schema\types\tmixed;
-use nur\sery\wip\schema\types\tpkey;
-use nur\sery\wip\schema\types\traw;
-use nur\sery\wip\schema\types\trawstring;
-use nur\sery\wip\schema\types\tstring;
-use nur\sery\wip\schema\types\ttext;
+use nulib\schema\types\IType;
+use nulib\schema\types\Registry;
+use nulib\schema\types\tarray;
+use nulib\schema\types\tbool;
+use nulib\schema\types\tfunc;
+use nulib\schema\types\tcontent;
+use nulib\schema\types\tfloat;
+use nulib\schema\types\tint;
+use nulib\schema\types\tkey;
+use nulib\schema\types\tmixed;
+use nulib\schema\types\tpkey;
+use nulib\schema\types\traw;
+use nulib\schema\types\trawstring;
+use nulib\schema\types\tstring;
+use nulib\schema\types\ttext;
 
 /**
  * Class types: classe outil pour gérer le registre de types

src/schema/types/IType.php

@@ -1,10 +1,10 @@
 <?php
-namespace nur\sery\wip\schema\types;
+namespace nulib\schema\types;
 
 use nulib\ValueException;
-use nur\sery\wip\schema\input\Input;
-use nur\sery\wip\schema\Result;
-use nur\sery\wip\schema\Schema;
+use nulib\schema\input\Input;
+use nulib\schema\Result;
+use nulib\schema\Schema;
 
 /**
  * Interface IType: un type de données

src/schema/types/Registry.php

@@ -1,5 +1,5 @@
 <?php
-namespace nur\sery\wip\schema\types;
+namespace nulib\schema\types;
 
 use nulib\cl;
 use nulib\php\func;

src/schema/types/_tformatable.php

@@ -1,5 +1,5 @@
 <?php
-namespace nur\sery\wip\schema\types;
+namespace nulib\schema\types;
 
 abstract class _tformatable extends _tsimple {
   const FORMAT = null;

src/schema/types/_tsimple.php

@@ -1,9 +1,9 @@
 <?php
-namespace nur\sery\wip\schema\types;
+namespace nulib\schema\types;
 
 use nulib\StateException;
 use nur\prop;
-use nur\sery\wip\schema\input\Input;
+use nulib\schema\input\Input;
 use nur\str;
 
 abstract class _tsimple implements IType {

src/schema/types/_tstring.php

@@ -1,5 +1,5 @@
 <?php
-namespace nur\sery\wip\schema\types;
+namespace nulib\schema\types;
 
 use nulib\str;
 

src/schema/types/_tunion.php

@@ -1,5 +1,5 @@
 <?php
-namespace nur\sery\wip\schema\types;
+namespace nulib\schema\types;
 
 abstract class _tunion extends _tsimple {
   function getPhpType(bool $allowNullable=true): ?string {

src/schema/types/tarray.php

@@ -1,12 +1,12 @@
 <?php
-namespace nur\sery\wip\schema\types;
+namespace nulib\schema\types;
 
 use nulib\cl;
 use nulib\ValueException;
-use nur\sery\wip\schema\_scalar\ScalarResult;
-use nur\sery\wip\schema\_scalar\ScalarSchema;
-use nur\sery\wip\schema\Result;
-use nur\sery\wip\schema\Schema;
+use nulib\schema\_scalar\ScalarResult;
+use nulib\schema\_scalar\ScalarSchema;
+use nulib\schema\Result;
+use nulib\schema\Schema;
 
 class tarray extends _tstring {
   const NAME = "array";

src/schema/types/tbool.php

@@ -1,14 +1,14 @@
 <?php
-namespace nur\sery\wip\schema\types;
+namespace nulib\schema\types;
 
 use nulib\cl;
 use nulib\ValueException;
 use nur\prop;
-use nur\sery\wip\schema\_scalar\ScalarResult;
-use nur\sery\wip\schema\_scalar\ScalarSchema;
-use nur\sery\wip\schema\input\Input;
-use nur\sery\wip\schema\Result;
-use nur\sery\wip\schema\Schema;
+use nulib\schema\_scalar\ScalarResult;
+use nulib\schema\_scalar\ScalarSchema;
+use nulib\schema\input\Input;
+use nulib\schema\Result;
+use nulib\schema\Schema;
 
 class tbool extends _tformatable {
   const NAME = "bool";

src/schema/types/tcontent.php

@@ -1,11 +1,11 @@
 <?php
-namespace nur\sery\wip\schema\types;
+namespace nulib\schema\types;
 
 use nulib\php\content\c;
-use nur\sery\wip\schema\_scalar\ScalarResult;
-use nur\sery\wip\schema\_scalar\ScalarSchema;
-use nur\sery\wip\schema\Result;
-use nur\sery\wip\schema\Schema;
+use nulib\schema\_scalar\ScalarResult;
+use nulib\schema\_scalar\ScalarSchema;
+use nulib\schema\Result;
+use nulib\schema\Schema;
 
 abstract class tcontent extends _tunion {
   const NAME = "content";

src/schema/types/tfloat.php

@@ -1,11 +1,11 @@
 <?php
-namespace nur\sery\wip\schema\types;
+namespace nulib\schema\types;
 
 use nulib\ValueException;
-use nur\sery\wip\schema\_scalar\ScalarResult;
-use nur\sery\wip\schema\_scalar\ScalarSchema;
-use nur\sery\wip\schema\Result;
-use nur\sery\wip\schema\Schema;
+use nulib\schema\_scalar\ScalarResult;
+use nulib\schema\_scalar\ScalarSchema;
+use nulib\schema\Result;
+use nulib\schema\Schema;
 
 class tfloat extends _tformatable {
   const NAME = "float";

src/schema/types/tfunc.php

@@ -1,13 +1,13 @@
 <?php
-namespace nur\sery\wip\schema\types;
+namespace nulib\schema\types;
 
 use Exception;
 use nulib\php\func;
 use nulib\ValueException;
-use nur\sery\wip\schema\_scalar\ScalarResult;
-use nur\sery\wip\schema\_scalar\ScalarSchema;
-use nur\sery\wip\schema\Result;
-use nur\sery\wip\schema\Schema;
+use nulib\schema\_scalar\ScalarResult;
+use nulib\schema\_scalar\ScalarSchema;
+use nulib\schema\Result;
+use nulib\schema\Schema;
 
 class tfunc extends _tsimple {
   const NAME = "func";

src/schema/types/tgeneric.php

@@ -1,12 +1,12 @@
 <?php
-namespace nur\sery\wip\schema\types;
+namespace nulib\schema\types;
 
 use nulib\ValueException;
-use nur\sery\wip\schema\_scalar\ScalarResult;
-use nur\sery\wip\schema\_scalar\ScalarSchema;
-use nur\sery\wip\schema\input\Input;
-use nur\sery\wip\schema\Result;
-use nur\sery\wip\schema\Schema;
+use nulib\schema\_scalar\ScalarResult;
+use nulib\schema\_scalar\ScalarSchema;
+use nulib\schema\input\Input;
+use nulib\schema\Result;
+use nulib\schema\Schema;
 
 class tgeneric extends _tsimple {
   function __construct(string $class, bool $nullable, ?array $params=null) {

src/schema/types/tint.php

@@ -1,11 +1,11 @@
 <?php
-namespace nur\sery\wip\schema\types;
+namespace nulib\schema\types;
 
 use nulib\ValueException;
-use nur\sery\wip\schema\_scalar\ScalarResult;
-use nur\sery\wip\schema\_scalar\ScalarSchema;
-use nur\sery\wip\schema\Result;
-use nur\sery\wip\schema\Schema;
+use nulib\schema\_scalar\ScalarResult;
+use nulib\schema\_scalar\ScalarSchema;
+use nulib\schema\Result;
+use nulib\schema\Schema;
 
 class tint extends _tformatable {
   const NAME = "int";

src/schema/types/tkey.php

@@ -1,10 +1,10 @@
 <?php
-namespace nur\sery\wip\schema\types;
+namespace nulib\schema\types;
 
-use nur\sery\wip\schema\_scalar\ScalarResult;
-use nur\sery\wip\schema\_scalar\ScalarSchema;
-use nur\sery\wip\schema\Result;
-use nur\sery\wip\schema\Schema;
+use nulib\schema\_scalar\ScalarResult;
+use nulib\schema\_scalar\ScalarSchema;
+use nulib\schema\Result;
+use nulib\schema\Schema;
 
 class tkey extends _tunion {
   const NAME = "key";

src/schema/types/tmixed.php

@@ -1,11 +1,11 @@
 <?php
-namespace nur\sery\wip\schema\types;
+namespace nulib\schema\types;
 
-use nur\sery\wip\schema\_scalar\ScalarResult;
-use nur\sery\wip\schema\_scalar\ScalarSchema;
-use nur\sery\wip\schema\input\Input;
-use nur\sery\wip\schema\Result;
-use nur\sery\wip\schema\Schema;
+use nulib\schema\_scalar\ScalarResult;
+use nulib\schema\_scalar\ScalarSchema;
+use nulib\schema\input\Input;
+use nulib\schema\Result;
+use nulib\schema\Schema;
 
 class tmixed extends _tsimple {
   const NAME = "mixed";

src/schema/types/tpkey.php

@@ -1,10 +1,10 @@
 <?php
-namespace nur\sery\wip\schema\types;
+namespace nulib\schema\types;
 
-use nur\sery\wip\schema\_scalar\ScalarResult;
-use nur\sery\wip\schema\_scalar\ScalarSchema;
-use nur\sery\wip\schema\Result;
-use nur\sery\wip\schema\Schema;
+use nulib\schema\_scalar\ScalarResult;
+use nulib\schema\_scalar\ScalarSchema;
+use nulib\schema\Result;
+use nulib\schema\Schema;
 
 class tpkey extends _tunion {
   const NAME = "pkey";

src/schema/types/traw.php

@@ -1,7 +1,7 @@
 <?php
-namespace nur\sery\wip\schema\types;
+namespace nulib\schema\types;
 
-use nur\sery\wip\schema\input\Input;
+use nulib\schema\input\Input;
 
 class traw extends tmixed {
   const NAME = "raw";

src/schema/types/trawstring.php

@@ -1,11 +1,11 @@
 <?php
-namespace nur\sery\wip\schema\types;
+namespace nulib\schema\types;
 
 use nulib\str;
-use nur\sery\wip\schema\_scalar\ScalarResult;
-use nur\sery\wip\schema\_scalar\ScalarSchema;
-use nur\sery\wip\schema\Result;
-use nur\sery\wip\schema\Schema;
+use nulib\schema\_scalar\ScalarResult;
+use nulib\schema\_scalar\ScalarSchema;
+use nulib\schema\Result;
+use nulib\schema\Schema;
 
 class trawstring extends _tstring {
   const NAME = "rawstring";

src/schema/types/tstring.php

@@ -1,5 +1,5 @@
 <?php
-namespace nur\sery\wip\schema\types;
+namespace nulib\schema\types;
 
 class tstring extends trawstring {
   const NAME = "string";

src/schema/types/ttext.php

@@ -1,5 +1,5 @@
 <?php
-namespace nur\sery\wip\schema\types;
+namespace nulib\schema\types;
 
 class ttext extends trawstring {
   const NAME = "text";

src/web/content/Tag.php

@@ -1,5 +1,5 @@
 <?php
-namespace nur\sery\wip\web\content;
+namespace nulib\web\content;
 
 
 use nulib\A;

src/web/content/v.php

@@ -1,5 +1,5 @@
 <?php
-namespace nur\sery\wip\web\content;
+namespace nulib\web\content;
 
 /**
  * Class v: classe outil pour gérer du contenu pour le web

src_glue/app.php

@@ -1,5 +0,0 @@
-<?php
-namespace nulib;
-
-class app extends \nur\sery\app {
-}

src_glue/app/cli/Application.php

@@ -1,5 +0,0 @@
-<?php
-namespace nulib\app\cli;
-
-abstract class Application extends \nur\sery\app\cli\Application {
-}

tests/php/access/KeyAccessTest.php

@@ -1,5 +1,5 @@
 <?php
-namespace nur\sery\wip\php\access;
+namespace nulib\php\access;
 
 use nulib\tests\TestCase;
 use stdClass;

tests/php/coll/CursorTest.php

@@ -1,5 +1,5 @@
 <?php
-namespace nur\sery\wip\php\coll;
+namespace nulib\php\coll;
 
 use Exception;
 use nulib\cl;

tests/php/content/cTest.php

@@ -1,9 +1,9 @@
 <?php
-namespace nur\sery\wip\php\content;
+namespace nulib\php\content;
 
 use nulib\php\content\c;
-use nur\sery\wip\php\content\impl\html;
-use nur\sery\wip\web\content\v;
+use nulib\php\content\impl\html;
+use nulib\web\content\v;
 use PHPUnit\Framework\TestCase;
 
 class cTest extends TestCase {

tests/php/content/impl/AContent.php

@@ -1,5 +1,5 @@
 <?php
-namespace nur\sery\wip\php\content\impl;
+namespace nulib\php\content\impl;
 
 use nulib\php\content\IContent;
 

tests/php/content/impl/APrintable.php

@@ -1,5 +1,5 @@
 <?php
-namespace nur\sery\wip\php\content\impl;
+namespace nulib\php\content\impl;
 
 use nulib\php\content\IPrintable;
 

tests/php/content/impl/ATag.php

@@ -1,5 +1,5 @@
 <?php
-namespace nur\sery\wip\php\content\impl;
+namespace nulib\php\content\impl;
 
 use nulib\php\content\c;
 use nulib\php\content\IContent;

tests/php/content/impl/html.php

@@ -1,5 +1,5 @@
 <?php
-namespace nur\sery\wip\php\content\impl;
+namespace nulib\php\content\impl;
 
 class html {
   const H1 = [self::class, "h1"];

tests/schema/_assoc/AssocSchemaTest.php

@@ -1,11 +1,11 @@
 <?php
-namespace nur\sery\wip\schema\_assoc;
+namespace nulib\schema\_assoc;
 
 use nulib\ext\yaml;
 use nulib\tests\TestCase;
 use nulib\ValueException;
-use nur\sery\wip\schema\_scalar\ScalarSchemaTest;
-use nur\sery\wip\schema\Schema;
+use nulib\schema\_scalar\ScalarSchemaTest;
+use nulib\schema\Schema;
 
 class AssocSchemaTest extends TestCase {
   const NULL_SCHEMA = [

tests/schema/_scalar/ScalarSchemaTest.php

@@ -1,8 +1,8 @@
 <?php
-namespace nur\sery\wip\schema\_scalar;
+namespace nulib\schema\_scalar;
 
 use nulib\tests\TestCase;
-use nur\sery\wip\schema\SchemaException;
+use nulib\schema\SchemaException;
 
 class ScalarSchemaTest extends TestCase {
   const NULL_SCHEMA = [

tests/schema/_scalar/ScalarWrapperTest.php

@@ -1,9 +1,9 @@
 <?php
-namespace nur\sery\wip\schema\_scalar;
+namespace nulib\schema\_scalar;
 
 use nulib\tests\TestCase;
 use nulib\ValueException;
-use nur\sery\wip\schema\input\Input;
+use nulib\schema\input\Input;
 use stdClass;
 
 class ScalarWrapperTest extends TestCase {

tests/schema/types/boolTest.php

@@ -1,10 +1,10 @@
 <?php
-namespace nur\sery\wip\schema\types;
+namespace nulib\schema\types;
 
 use Exception;
 use nulib\tests\TestCase;
-use nur\sery\wip\schema\_scalar\ScalarWrapper;
-use nur\sery\wip\schema\Schema;
+use nulib\schema\_scalar\ScalarWrapper;
+use nulib\schema\Schema;
 
 class boolTest extends TestCase {
   function commonTests($wrapper, &$value, callable $wrapperSetter): void {

tests/schema/types/floatTest.php

@@ -1,10 +1,10 @@
 <?php
-namespace nur\sery\wip\schema\types;
+namespace nulib\schema\types;
 
 use Exception;
 use nulib\tests\TestCase;
-use nur\sery\wip\schema\_scalar\ScalarWrapper;
-use nur\sery\wip\schema\Schema;
+use nulib\schema\_scalar\ScalarWrapper;
+use nulib\schema\Schema;
 
 class floatTest extends TestCase {
   function commonTests($wrapper, &$value, callable $wrapperSetter): void {

tests/schema/types/intTest.php

@@ -1,10 +1,10 @@
 <?php
-namespace nur\sery\wip\schema\types;
+namespace nulib\schema\types;
 
 use Exception;
 use nulib\tests\TestCase;
-use nur\sery\wip\schema\_scalar\ScalarWrapper;
-use nur\sery\wip\schema\Schema;
+use nulib\schema\_scalar\ScalarWrapper;
+use nulib\schema\Schema;
 
 class intTest extends TestCase {
   function commonTests($wrapper, &$value, callable $wrapperSetter): void {

tests/schema/types/strTest.php

@@ -1,10 +1,10 @@
 <?php
-namespace nur\sery\wip\schema\types;
+namespace nulib\schema\types;
 
 use Exception;
 use nulib\tests\TestCase;
-use nur\sery\wip\schema\_scalar\ScalarWrapper;
-use nur\sery\wip\schema\Schema;
+use nulib\schema\_scalar\ScalarWrapper;
+use nulib\schema\Schema;
 
 class strTest extends TestCase {
   function commonTests($wrapper, &$value, callable $wrapperSetter): void {

tests/schema/types/unionTest.php

@@ -1,9 +1,9 @@
 <?php
-namespace nur\sery\wip\schema\types;
+namespace nulib\schema\types;
 
 use nulib\tests\TestCase;
-use nur\sery\wip\schema\_scalar\ScalarWrapper;
-use nur\sery\wip\schema\Schema;
+use nulib\schema\_scalar\ScalarWrapper;
+use nulib\schema\Schema;
 
 class unionTest extends TestCase {
   function testUnionTypes() {