revenir à nur/sery pour faciliter la migration

This commit is contained in:
Jephté Clain 2024-11-28 21:24:16 +04:00
parent 89ab481619
commit 62da6342b3
95 changed files with 289 additions and 290 deletions

View File

@ -4,9 +4,9 @@
<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\ture\wip\" />
<sourceFolder url="file://$MODULE_DIR$/src_app" isTestSource="false" packagePrefix="nur\ture\" />
<sourceFolder url="file://$MODULE_DIR$/tests" isTestSource="true" packagePrefix="nur\ture\" />
<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\" />
<excludeFolder url="file://$MODULE_DIR$/vendor" />
</content>
<orderEntry type="inheritedJdk" />

View File

@ -1,6 +1,6 @@
# TODO
* [ ] bbnurse -cmk supprime la classe dans nur\ture après l'avoir copié dans la
* [ ] bbnurse -cmk supprime la classe dans nur\sery après l'avoir copié dans la
destination

22
bbnurse
View File

@ -18,7 +18,7 @@ function copy_mature() {
if [ -f "$src" ]; then
# fichier
setx src=abspath "$src"
[ "${src#$MYDIR/src/}" != "$src" ] || die "la source doit être dans nur-ture/src/"
[ "${src#$MYDIR/src/}" != "$src" ] || die "la source doit être dans nur-sery/src/"
src="${src#$MYDIR/src/}"
if [[ "$src" == */* ]]; then
path="${src%/*}"
@ -33,25 +33,25 @@ function copy_mature() {
elif [ -d "$src" ]; then
# répertoire de package
setx src=abspath "$src"
[ "$src" == "$MYDIR/src" -o "${src#$MYDIR/src/}" != "$src" ] || die "la source doit être dans nur-ture/src/"
[ "$src" == "$MYDIR/src" -o "${src#$MYDIR/src/}" != "$src" ] || die "la source doit être dans nur-sery/src/"
srcdir="$src"
path="${src#$MYDIR/src}"; path="${path#/}"
else
# package
src="${src//\\\\/\/}"
src="${src%/}"
[ -d "$MYDIR/src/$src" ] || die "la source doit être un package de nur-ture"
[ -d "$MYDIR/src/$src" ] || die "la source doit être un package de nur-sery"
srcdir="$MYDIR/src/$src"
path="$src"
fi
tsrcdir=
nurturepackage='nur\ture'; nulibpackage='nulib'
nurturepackage='nur\sery'; nulibpackage='nulib'
if [ -n "$path" ]; then
srcpackage="nur/ture/$path"; srcpackage="${srcpackage//\//\\}"
srcpackage="nur/sery/$path"; srcpackage="${srcpackage//\//\\}"
destpackage="nulib/$path"; destpackage="${destpackage//\//\\}"
[ -d "$MYDIR/tests/$path" ] && tsrcdir="$MYDIR/tests/$path"
else
srcpackage='nur\ture'
srcpackage='nur\sery'
destpackage='nulib'
fi
@ -134,11 +134,11 @@ function nulib_sync_mature() {
estep "Mise à jour des packages"
setx -a dests=find "$destdir/src/" -type f
for dest in "${dests[@]}"; do
sed -i 's|nur\\ture|nulib|g' "$dest"
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\\ture|nulib|g' "$dest"
sed -i 's|nur\\sery|nulib|g' "$dest"
done
}
@ -147,7 +147,7 @@ function update_nurse() {
}
function update_mature() {
srcpackage='nur\ture'
srcpackage='nur\sery'
destpackage='nulib'
if [ -n "$Dest" ]; then
@ -202,7 +202,7 @@ Pour chaque type d'évolution, il y a deux actions possibles:
* DEST est le répertoire du projet nulib-* ou le répertoire courant sinon
* mettre à jour (-u)
* mettre en nurserie (-un) met à jour les sources d'un projet pour utiliser la
version de nur/ture
version de nur/sery
* arriver à maturation (-um) met à jour les sources d'un projet pour utiliser
la version mature à maturation
L'argument est un 'package' ou un 'sous\\package' (dont le nom commence par
@ -212,7 +212,7 @@ 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/ture -d ../nulib' mais omet le package nur\\ture\\wip"
--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[@]}"

View File

@ -53,8 +53,8 @@
},
"autoload": {
"psr-4": {
"nur\\ture\\wip\\": "src",
"nur\\ture\\": "src_app",
"nur\\sery\\wip\\": "src",
"nur\\sery\\": "src_app",
"nur\\": "nur_src"
},
"files": [
@ -63,7 +63,7 @@
},
"autoload-dev": {
"psr-4": {
"nur\\ture\\": "tests",
"nur\\sery\\": "tests",
"nur\\": "nur_tests"
}
},

6
composer.lock generated
View File

@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
"content-hash": "59f960588ea6ef57b3974fbfc65b7d17",
"content-hash": "fd786c1eb69e14f16916905711daf8ca",
"packages": [],
"packages-dev": [
{
@ -510,7 +510,7 @@
"source": {
"type": "git",
"url": "https://git.univ-reunion.fr/sda-php/nulib.git",
"reference": "2a35a6de7105ab2e14edf912d3c47de1513da6d2"
"reference": "325391d60c2ed3a6ead71992d98aa2ce205bd293"
},
"require": {
"php": "^7.4"
@ -545,7 +545,7 @@
}
],
"description": "fonctions et classes essentielles",
"time": "2024-11-28T15:57:48+00:00"
"time": "2024-11-28T16:58:43+00:00"
},
{
"name": "nulib/phpss",

View File

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

View File

@ -13,8 +13,8 @@ use nur\b\params\Tparametrable;
use nur\data\types\Tmd;
use nur\file;
use nur\os;
use nur\ture\php\time\DateTime;
use nur\ture\php\time\Delay;
use nulib\php\time\DateTime;
use nulib\php\time\Delay;
/**
* Class FileCachedValue: un fichier utilisé pour mettre en cache certaines

View File

@ -1,7 +1,7 @@
<?php
namespace nur\b\io;
use nur\ture\file\FileReader;
use nulib\file\FileReader;
use nur\v\http;
/**

View File

@ -16,7 +16,7 @@ use nur\config\ArrayConfig;
use nur\msg;
use nur\os;
use nur\path;
use nur\ture\app;
use nur\sery\app;
/**
* Class Application: application de base

View File

@ -10,7 +10,7 @@ use nur\b\ValueException;
use nur\data\types\md_utils;
use nur\data\types\Metadata;
use nur\iter;
use nur\sery\output\msg;
use nulib\output\msg;
class LdapSearch extends Parametrable implements IteratorAggregate {
use Tparametrable;

View File

@ -3,7 +3,7 @@ namespace nur\ldap\app;
use nur\ldap\LdapSearch;
use nur\ldap\LdapWalker;
use nur\sery\output\msg;
use nulib\output\msg;
class LdapDeleteApp extends LdapApplication {
const ARGS = [

View File

@ -5,7 +5,7 @@ use nur\A;
use nur\b\ValueException;
use nur\config;
use nur\path;
use nur\sery\output\msg;
use nulib\output\msg;
use nur\SL;
abstract class ldap_server {

View File

@ -1,7 +1,7 @@
<?php
namespace nur\ldap\schemas;
use nur\sery\output\log;
use nulib\output\log;
class LseAttribute extends LseParser {
protected $data;

View File

@ -1,7 +1,7 @@
<?php
namespace nur\ldap\schemas;
use nur\sery\output\log;
use nulib\output\log;
class LseObjectClass extends LseParser {
const BOOL_ATTRS = [];

View File

@ -1,7 +1,7 @@
<?php
namespace nur\ldap\schemas;
use nur\sery\output\log;
use nulib\output\log;
class LseSyntax extends LseParser {
const BOOL_ATTRS = [

View File

@ -4,7 +4,7 @@ namespace nur\m\pdo\mysql;
use nur\m\IQuery;
use nur\m\IRowIncarnation;
use nur\m\pdo\PdoQuery;
use nur\ture\db\mysql\query;
use nulib\db\mysql\query;
class MysqlQuery extends PdoQuery {
protected function newRowIncarnation(): IRowIncarnation {

View File

@ -1,10 +1,9 @@
<?php
namespace nur\ref;
use nulib\php\content\c;
use nur\data\types\Metadata;
use nur\md;
use nur\ture\os\file\file;
use nur\ture\php\content\c;
/**
* Class ref_type: référence des types utilisables dans les schémas
@ -106,7 +105,7 @@ class ref_type {
/** comme {@link c} mais nullable */
const NCONTENT = "?".self::CONTENT;
/** comme {@link \nur\ture\FILE} mais nullable */
/** comme {@link \nur\sery\FILE} mais nullable */
const NFILE = "?".self::FILE;
/** comme {@link DATETIME} mais nullable */

View File

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

View File

@ -7,7 +7,7 @@ use nur\php\UpdateClassesApp;
UpdateClassesApp::run(new class extends UpdateClassesApp {
const MAPPINGS = [
"src" => [
"package" => "nur\\ture\\",
"package" => "nur\\sery\\",
"path" => __DIR__."/../src",
"classes" => [
],

View File

@ -1,7 +1,7 @@
<?php
namespace nur\ture\wip\php\access;
namespace nur\sery\wip\php\access;
use nur\ture\cl;
use nur\sery\cl;
/**
* Class AbstractAccess: implémentation par défaut pour des instances standard

View File

@ -1,7 +1,7 @@
<?php
namespace nur\ture\wip\php\access;
namespace nur\sery\wip\php\access;
use nur\ture\cl;
use nur\sery\cl;
/**
* Class FormAccess: accès à une valeur de $_POST puis $_GET, dans cet ordre

View File

@ -1,7 +1,7 @@
<?php
namespace nur\ture\wip\php\access;
namespace nur\sery\wip\php\access;
use nur\ture\cl;
use nur\sery\cl;
/**
* Class GetAccess: accès à une valeur de $_GET

View File

@ -1,5 +1,5 @@
<?php
namespace nur\ture\wip\php\access;
namespace nur\sery\wip\php\access;
/**
* Interface IAccess: abstraction d'un accès complet à une valeur

View File

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

View File

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

View File

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

View File

@ -1,8 +1,8 @@
<?php
namespace nur\ture\wip\php\access;
namespace nur\sery\wip\php\access;
use ArrayAccess;
use nur\ture\cl;
use nur\sery\cl;
/**
* Class KeyAccess: accès à une valeur d'une clé dans un tableau

View File

@ -1,7 +1,7 @@
<?php
namespace nur\ture\wip\php\access;
namespace nur\sery\wip\php\access;
use nur\ture\cl;
use nur\sery\cl;
/**
* Class PostAccess: accès à une valeur de $_POST

View File

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

View File

@ -1,5 +1,5 @@
<?php
namespace nur\ture\wip\php\access;
namespace nur\sery\wip\php\access;
/**
* Class ValueAccess: accès à une valeur unitaire

View File

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

View File

@ -1,4 +1,4 @@
# nur\ture\schema
# nur\sery\schema
objet: s'assurer que des données soit dans un type particulier, en les
convertissant si nécessaire. la source de ces données peut-être diverse:

View File

@ -1,9 +1,9 @@
<?php
namespace nur\ture\wip\schema;
namespace nur\sery\wip\schema;
use nur\ture\wip\schema\_assoc\AssocResult;
use nur\ture\wip\schema\_list\ListResult;
use nur\ture\wip\schema\_scalar\ScalarResult;
use nur\sery\wip\schema\_assoc\AssocResult;
use nur\sery\wip\schema\_list\ListResult;
use nur\sery\wip\schema\_scalar\ScalarResult;
/**
* Class Result: résultat de l'analyse ou de la normalisation d'une valeur

View File

@ -1,12 +1,12 @@
<?php
namespace nur\ture\wip\schema;
namespace nur\sery\wip\schema;
use ArrayAccess;
use nur\ture\AccessException;
use nur\ture\cl;
use nur\ture\wip\schema\_assoc\AssocSchema;
use nur\ture\wip\schema\_list\ListSchema;
use nur\ture\wip\schema\_scalar\ScalarSchema;
use nur\sery\AccessException;
use nur\sery\cl;
use nur\sery\wip\schema\_assoc\AssocSchema;
use nur\sery\wip\schema\_list\ListSchema;
use nur\sery\wip\schema\_scalar\ScalarSchema;
abstract class Schema implements ArrayAccess {
/**

View File

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

View File

@ -1,4 +1,4 @@
# nur\ture\schema
# nur\sery\schema
* implémenter support `analyzer_func`, `extractor_func`, `parser_func`,
`normalizer_func`, `formatter_func`

View File

@ -1,12 +1,12 @@
<?php
namespace nur\ture\wip\schema;
namespace nur\sery\wip\schema;
use ArrayAccess;
use IteratorAggregate;
use nur\ture\wip\schema\_assoc\AssocValue;
use nur\ture\wip\schema\_list\ListValue;
use nur\ture\wip\schema\_scalar\ScalarValue;
use nur\ture\wip\schema\types\IType;
use nur\sery\wip\schema\_assoc\AssocValue;
use nur\sery\wip\schema\_list\ListValue;
use nur\sery\wip\schema\_scalar\ScalarValue;
use nur\sery\wip\schema\types\IType;
abstract class Value implements ArrayAccess, IteratorAggregate {
function isAssoc(?AssocValue &$assoc=null): bool { return false; }

View File

@ -1,7 +1,7 @@
<?php
namespace nur\ture\wip\schema\_assoc;
namespace nur\sery\wip\schema\_assoc;
use nur\ture\wip\schema\Result;
use nur\sery\wip\schema\Result;
class AssocResult extends Result {
function isAssoc(?AssocResult &$assoc=null): bool { $assoc = $this; return true;}

View File

@ -1,10 +1,10 @@
<?php
namespace nur\ture\wip\schema\_assoc;
namespace nur\sery\wip\schema\_assoc;
use nur\ture\cl;
use nur\ture\ref\schema\ref_schema;
use nur\ture\wip\schema\Schema;
use nur\ture\wip\schema\Value;
use nur\sery\cl;
use nur\sery\ref\schema\ref_schema;
use nur\sery\wip\schema\Schema;
use nur\sery\wip\schema\Value;
/**
* Class AssocSchema

View File

@ -1,8 +1,8 @@
<?php
namespace nur\ture\wip\schema\_assoc;
namespace nur\sery\wip\schema\_assoc;
use nur\ture\wip\schema\Result;
use nur\ture\wip\schema\Value;
use nur\sery\wip\schema\Result;
use nur\sery\wip\schema\Value;
class AssocValue extends Value {
function isAssoc(?AssocValue &$assoc=null): bool { $assoc = $this; return true; }

View File

@ -1,7 +1,7 @@
<?php
namespace nur\ture\wip\schema\_list;
namespace nur\sery\wip\schema\_list;
use nur\ture\wip\schema\Result;
use nur\sery\wip\schema\Result;
class ListResult extends Result {
function isList(?ListResult &$list=null): bool { $list = $this; return true;}

View File

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

View File

@ -1,8 +1,8 @@
<?php
namespace nur\ture\wip\schema\_list;
namespace nur\sery\wip\schema\_list;
use nur\ture\wip\schema\Result;
use nur\ture\wip\schema\Value;
use nur\sery\wip\schema\Result;
use nur\sery\wip\schema\Value;
class ListValue extends Value {
function isList(?ListValue &$list=null): bool { $list = $this; return true; }

View File

@ -1,11 +1,11 @@
<?php
namespace nur\ture\wip\schema\_scalar;
namespace nur\sery\wip\schema\_scalar;
use nur\ture\cl;
use nur\ture\ref\schema\ref_analyze;
use nur\ture\ref\schema\ref_schema;
use nur\ture\ValueException;
use nur\ture\wip\schema\Result;
use nur\sery\cl;
use nur\sery\ref\schema\ref_analyze;
use nur\sery\ref\schema\ref_schema;
use nur\sery\ValueException;
use nur\sery\wip\schema\Result;
/**
* Class ScalarResult: résultat de l'analyse ou de la normalisation d'une valeur

View File

@ -1,18 +1,18 @@
<?php
namespace nur\ture\wip\schema\_scalar;
namespace nur\sery\wip\schema\_scalar;
use nur\ture\cl;
use nur\ture\ref\schema\ref_schema;
use nur\ture\ref\schema\ref_types;
use nur\ture\wip\schema\Schema;
use nur\ture\wip\schema\SchemaException;
use nur\ture\wip\schema\types\tarray;
use nur\ture\wip\schema\types\tbool;
use nur\ture\wip\schema\types\tcallable;
use nur\ture\wip\schema\types\tcontent;
use nur\ture\wip\schema\types\tpkey;
use nur\ture\wip\schema\types\tstring;
use nur\ture\wip\schema\Value;
use nur\sery\cl;
use nur\sery\ref\schema\ref_schema;
use nur\sery\ref\schema\ref_types;
use nur\sery\wip\schema\Schema;
use nur\sery\wip\schema\SchemaException;
use nur\sery\wip\schema\types\tarray;
use nur\sery\wip\schema\types\tbool;
use nur\sery\wip\schema\types\tcallable;
use nur\sery\wip\schema\types\tcontent;
use nur\sery\wip\schema\types\tpkey;
use nur\sery\wip\schema\types\tstring;
use nur\sery\wip\schema\Value;
/**
* Class ScalarSchema

View File

@ -1,12 +1,12 @@
<?php
namespace nur\ture\wip\schema\_scalar;
namespace nur\sery\wip\schema\_scalar;
use nur\ture\ref\schema\ref_analyze;
use nur\ture\ValueException;
use nur\ture\wip\schema\input\Input;
use nur\ture\wip\schema\types;
use nur\ture\wip\schema\types\IType;
use nur\ture\wip\schema\Value;
use nur\sery\ref\schema\ref_analyze;
use nur\sery\ValueException;
use nur\sery\wip\schema\input\Input;
use nur\sery\wip\schema\types;
use nur\sery\wip\schema\types\IType;
use nur\sery\wip\schema\Value;
class ScalarValue extends Value {
function __construct(ScalarSchema $schema, &$dest=null, $destKey=null, bool $defaultVerifix=true, ?bool $defaultThrow=null) {

View File

@ -1,12 +1,12 @@
<?php
namespace nur\ture\wip\schema\input;
namespace nur\sery\wip\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\ture\wip\php\access\FormAccess;
use nur\ture\wip\php\access\IAccess;
use nur\ture\wip\php\access\KeyAccess;
use nur\ture\wip\php\access\ShadowAccess;
use nur\sery\wip\php\access\FormAccess;
use nur\sery\wip\php\access\IAccess;
use nur\sery\wip\php\access\KeyAccess;
use nur\sery\wip\php\access\ShadowAccess;
/**
* Class FormInput: accès à des paramètres de formulaire (POST ou GET, dans cet

View File

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

View File

@ -1,9 +1,9 @@
<?php
namespace nur\ture\wip\schema\input;
namespace nur\sery\wip\schema\input;
use nur\ture\wip\php\access\IAccess;
use nur\ture\wip\php\access\KeyAccess;
use nur\ture\wip\php\access\ValueAccess;
use nur\sery\wip\php\access\IAccess;
use nur\sery\wip\php\access\KeyAccess;
use nur\sery\wip\php\access\ValueAccess;
/**
* Class Input: accès à une valeur

View File

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

View File

@ -1,14 +1,14 @@
<?php
namespace nur\ture\wip\schema;
namespace nur\sery\wip\schema;
use nur\ture\wip\schema\types\IType;
use nur\ture\wip\schema\types\Registry;
use nur\ture\wip\schema\types\tarray;
use nur\ture\wip\schema\types\tbool;
use nur\ture\wip\schema\types\tcallable;
use nur\ture\wip\schema\types\tfloat;
use nur\ture\wip\schema\types\tint;
use nur\ture\wip\schema\types\tstring;
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\tcallable;
use nur\sery\wip\schema\types\tfloat;
use nur\sery\wip\schema\types\tint;
use nur\sery\wip\schema\types\tstring;
/**
* Class types: classe outil pour gérer le registre de types

View File

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

View File

@ -1,7 +1,7 @@
<?php
namespace nur\ture\wip\schema\types;
namespace nur\sery\wip\schema\types;
use nur\ture\cl;
use nur\sery\cl;
class Registry {
const TYPES = [

View File

@ -1,7 +1,7 @@
<?php
namespace nur\ture\wip\schema\types;
namespace nur\sery\wip\schema\types;
use nur\ture\wip\schema\input\Input;
use nur\sery\wip\schema\input\Input;
abstract class _tsimple implements IType {
function isAvailable(Input $input, $destKey): bool {

View File

@ -1,9 +1,9 @@
<?php
namespace nur\ture\wip\schema\types;
namespace nur\sery\wip\schema\types;
use nur\ture\cl;
use nur\ture\wip\schema\Result;
use nur\ture\wip\schema\Schema;
use nur\sery\cl;
use nur\sery\wip\schema\Result;
use nur\sery\wip\schema\Schema;
class tarray extends _tsimple {
static function ensure_array(&$array): void {

View File

@ -1,13 +1,13 @@
<?php
namespace nur\ture\wip\schema\types;
namespace nur\sery\wip\schema\types;
use nur\ture\cl;
use nur\ture\ValueException;
use nur\ture\wip\schema\_scalar\ScalarResult;
use nur\ture\wip\schema\_scalar\ScalarSchema;
use nur\ture\wip\schema\input\Input;
use nur\ture\wip\schema\Result;
use nur\ture\wip\schema\Schema;
use nur\sery\cl;
use nur\sery\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;
class tbool extends _tsimple {
/** liste de valeurs chaines à considérer comme 'OUI' */

View File

@ -1,10 +1,10 @@
<?php
namespace nur\ture\wip\schema\types;
namespace nur\sery\wip\schema\types;
use nur\ture\php\nur_func;
use nur\ture\ValueException;
use nur\ture\wip\schema\Result;
use nur\ture\wip\schema\Schema;
use nur\sery\php\nur_func;
use nur\sery\ValueException;
use nur\sery\wip\schema\Result;
use nur\sery\wip\schema\Schema;
use stdClass;
class tcallable extends _tsimple {

View File

@ -1,8 +1,8 @@
<?php
namespace nur\ture\wip\schema\types;
namespace nur\sery\wip\schema\types;
use nur\ture\wip\schema\Result;
use nur\ture\wip\schema\Schema;
use nur\sery\wip\schema\Result;
use nur\sery\wip\schema\Schema;
abstract class tcontent extends _tsimple {
static function ensure_content(&$content): void {

View File

@ -1,10 +1,10 @@
<?php
namespace nur\ture\wip\schema\types;
namespace nur\sery\wip\schema\types;
use nur\ture\wip\schema\_scalar\ScalarResult;
use nur\ture\wip\schema\_scalar\ScalarSchema;
use nur\ture\wip\schema\Result;
use nur\ture\wip\schema\Schema;
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;
class tfloat extends _tsimple {
static function ensure_float(&$float): void {

View File

@ -1,10 +1,10 @@
<?php
namespace nur\ture\wip\schema\types;
namespace nur\sery\wip\schema\types;
use nur\ture\wip\schema\_scalar\ScalarResult;
use nur\ture\wip\schema\_scalar\ScalarSchema;
use nur\ture\wip\schema\Result;
use nur\ture\wip\schema\Schema;
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;
class tint extends _tsimple {
static function ensure_int(&$int): void {

View File

@ -1,8 +1,8 @@
<?php
namespace nur\ture\wip\schema\types;
namespace nur\sery\wip\schema\types;
use nur\ture\wip\schema\Result;
use nur\ture\wip\schema\Schema;
use nur\sery\wip\schema\Result;
use nur\sery\wip\schema\Schema;
class tkey extends _tsimple {
static function ensure_key(&$key): void {

View File

@ -1,8 +1,8 @@
<?php
namespace nur\ture\wip\schema\types;
namespace nur\sery\wip\schema\types;
use nur\ture\wip\schema\Result;
use nur\ture\wip\schema\Schema;
use nur\sery\wip\schema\Result;
use nur\sery\wip\schema\Schema;
class tpkey extends _tsimple {
static function ensure_pkey(&$pkey): void {

View File

@ -1,10 +1,10 @@
<?php
namespace nur\ture\wip\schema\types;
namespace nur\sery\wip\schema\types;
use nur\ture\wip\schema\_scalar\ScalarResult;
use nur\ture\wip\schema\_scalar\ScalarSchema;
use nur\ture\wip\schema\Result;
use nur\ture\wip\schema\Schema;
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;
class tstring extends _tsimple {
static function ensure_string(&$string): void {

View File

@ -1,9 +1,9 @@
<?php
namespace nur\ture\wip\web\content;
namespace nur\sery\wip\web\content;
use nur\ture\A;
use nur\ture\php\content\c;
use nur\ture\php\content\IContent;
use nur\sery\A;
use nur\sery\php\content\c;
use nur\sery\php\content\IContent;
class Tag implements IContent {
function __construct(string $tag, $content=null) {

View File

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

View File

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

View File

@ -1,5 +1,5 @@
<?php
namespace nur\ture\app\cli;
namespace nur\sery\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\ture\app;
use nur\sery\app;
/**
* Class Application: application de base

View File

@ -9,4 +9,4 @@ const NULIB_APP_app_params = [
"projdir" => __DIR__ . '/..',
"appcode" => \app\config\bootstrap::APPCODE,
];
require __DIR__.'/../vendor/nur/ture/src/app/cli/include-launcher.php';
require __DIR__.'/../vendor/nur/sery/src/app/cli/include-launcher.php';

View File

@ -5,8 +5,8 @@
require __DIR__.'/../vendor/autoload.php';
# Lancer une application en tâche de fond
use nur\ture\tools\BgLauncherApp;
use nur\ture\app;
use nur\sery\tools\BgLauncherApp;
use nur\sery\app;
# chemin vers le lanceur PHP
const NULIB_APP_app_launcher = __DIR__.'/../_cli/.launcher.php';

View File

@ -1,9 +1,9 @@
<?php
namespace nur\ture\app;
namespace nur\sery\app;
use nulib\tests\TestCase;
use nur\ture\app\args;
use nur\sery\app\args;
class argsTest extends TestCase {
function testFrom_array() {

View File

@ -1,10 +1,10 @@
<?php
namespace nur\ture {
namespace nur\sery {
use nulib\tests\TestCase;
use nur\ture\impl\config;
use nur\ture\impl\myapp;
use nur\ture\impl\MyApplication1;
use nur\ture\impl\MyApplication2;
use nur\sery\impl\config;
use nur\sery\impl\myapp;
use nur\sery\impl\MyApplication1;
use nur\sery\impl\MyApplication2;
class appTest extends TestCase {
function testWith() {
@ -19,7 +19,7 @@ namespace nur\ture {
"bindir" => "$projdir/vendor/bin",
"autoload" => "$projdir/vendor/autoload.php",
],
"appcode" => "nur-ture",
"appcode" => "nur-sery",
"cwd" => $cwd,
"datadir" => "$projdir/devel",
"etcdir" => "$projdir/devel/etc",
@ -38,7 +38,7 @@ namespace nur\ture {
"bindir" => "$projdir/vendor/bin",
"autoload" => "$projdir/vendor/autoload.php",
],
"appcode" => "nur-ture",
"appcode" => "nur-sery",
"cwd" => $cwd,
"datadir" => "$projdir/devel",
"etcdir" => "$projdir/devel/etc",
@ -63,7 +63,7 @@ namespace nur\ture {
"bindir" => "$projdir/vendor/bin",
"autoload" => "$projdir/vendor/autoload.php",
],
"appcode" => "nur-ture",
"appcode" => "nur-sery",
"cwd" => $cwd,
"datadir" => "$projdir/devel",
"etcdir" => "$projdir/devel/etc",
@ -82,7 +82,7 @@ namespace nur\ture {
"bindir" => "$projdir/vendor/bin",
"autoload" => "$projdir/vendor/autoload.php",
],
"appcode" => "nur-ture",
"appcode" => "nur-sery",
"cwd" => $cwd,
"datadir" => "$projdir/devel",
"etcdir" => "$projdir/devel/etc",
@ -97,11 +97,11 @@ namespace nur\ture {
}
}
namespace nur\ture\impl {
namespace nur\sery\impl {
use nur\ture\app\cli\Application;
use nur\ture\os\path;
use nur\ture\app;
use nur\sery\app\cli\Application;
use nur\sery\os\path;
use nur\sery\app;
class config {
const PROJDIR = __DIR__.'/..';

View File

@ -1,10 +1,10 @@
<?php
namespace nur\ture\db\sqlite;
namespace nur\sery\db\sqlite;
use nulib\tests\TestCase;
use nur\ture\cl;
use nur\ture\db\Capacitor;
use nur\ture\db\CapacitorChannel;
use nur\sery\cl;
use nur\sery\db\Capacitor;
use nur\sery\db\CapacitorChannel;
class SqliteStorageTest extends TestCase {
function _testChargeStrings(SqliteStorage $storage, ?string $channel) {

View File

@ -1,5 +1,5 @@
<?php
namespace nur\ture\db\sqlite;
namespace nur\sery\db\sqlite;
use Exception;
use nulib\tests\TestCase;

View File

@ -1,5 +1,5 @@
<?php
namespace nur\ture\db\sqlite;
namespace nur\sery\db\sqlite;
use PHPUnit\Framework\TestCase;

View File

@ -1,7 +1,7 @@
<?php
namespace nur\ture\file\base;
namespace nur\sery\file\base;
use nur\ture\file\FileReader;
use nur\sery\file\FileReader;
use PHPUnit\Framework\TestCase;
class FileReaderTest extends TestCase {

View File

@ -1,8 +1,8 @@
<?php
namespace nur\ture\php\access;
namespace nur\sery\php\access;
use nulib\tests\TestCase;
use nur\ture\wip\php\access\KeyAccess;
use nur\sery\wip\php\access\KeyAccess;
use stdClass;
class KeyAccessTest extends TestCase {

View File

@ -1,8 +1,8 @@
<?php
namespace nur\ture\php\access;
namespace nur\sery\php\access;
use nulib\tests\TestCase;
use nur\ture\wip\php\access\ValueAccess;
use nur\sery\wip\php\access\ValueAccess;
use stdClass;
class ValueAccessTest extends TestCase {

View File

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

View File

@ -1,7 +1,7 @@
<?php
namespace nur\ture\php\content\impl;
namespace nur\sery\php\content\impl;
use nur\ture\php\content\IContent;
use nur\sery\php\content\IContent;
class AContent implements IContent {
function getContent(): iterable {

View File

@ -1,7 +1,7 @@
<?php
namespace nur\ture\php\content\impl;
namespace nur\sery\php\content\impl;
use nur\ture\php\content\IPrintable;
use nur\sery\php\content\IPrintable;
class APrintable implements IPrintable {
function print(): void {

View File

@ -1,8 +1,8 @@
<?php
namespace nur\ture\php\content\impl;
namespace nur\sery\php\content\impl;
use nur\ture\php\content\c;
use nur\ture\php\content\IContent;
use nur\sery\php\content\c;
use nur\sery\php\content\IContent;
class ATag implements IContent {
function __construct(string $tag, $content=null) {

View File

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

View File

@ -1,11 +1,11 @@
<?php
namespace nur\ture\php {
namespace nur\sery\php {
use nulib\tests\TestCase;
use nur\ture\ValueException;
use nur\ture\php\impl\C0;
use nur\ture\php\impl\C1;
use nur\ture\php\impl\SC;
use nur\sery\ValueException;
use nur\sery\php\impl\C0;
use nur\sery\php\impl\C1;
use nur\sery\php\impl\SC;
use ReflectionException;
class funcTest extends TestCase {
@ -35,9 +35,9 @@ namespace nur\ture\php {
true, [false, "tsimple"],
true, [false, "tsimple"],
],
['nur\ture\php\impl\ntsimple',
true, [false, 'nur\ture\php\impl\ntsimple'],
true, [false, 'nur\ture\php\impl\ntsimple'],
['nur\sery\php\impl\ntsimple',
true, [false, 'nur\sery\php\impl\ntsimple'],
true, [false, 'nur\sery\php\impl\ntsimple'],
],
['tmissing',
false, null,
@ -112,7 +112,7 @@ namespace nur\ture\php {
false, null,
false, null,
],
[['nur\ture\php\impl\ntsimple'],
[['nur\sery\php\impl\ntsimple'],
false, null,
false, null,
],
@ -161,7 +161,7 @@ namespace nur\ture\php {
false, null,
false, null,
],
[[null, 'nur\ture\php\impl\ntsimple'],
[[null, 'nur\sery\php\impl\ntsimple'],
false, null,
false, null,
],
@ -189,9 +189,9 @@ namespace nur\ture\php {
true, [false, "tsimple"],
true, [false, "tsimple"],
],
[[false, 'nur\ture\php\impl\ntsimple'],
true, [false, 'nur\ture\php\impl\ntsimple'],
true, [false, 'nur\ture\php\impl\ntsimple'],
[[false, 'nur\sery\php\impl\ntsimple'],
true, [false, 'nur\sery\php\impl\ntsimple'],
true, [false, 'nur\sery\php\impl\ntsimple'],
],
[[false, "tmissing"],
false, null,
@ -217,7 +217,7 @@ namespace nur\ture\php {
false, null,
false, null,
],
[["", 'nur\ture\php\impl\ntsimple'],
[["", 'nur\sery\php\impl\ntsimple'],
false, null,
false, null,
],
@ -335,7 +335,7 @@ namespace nur\ture\php {
false, null, null,
false, null, null,
],
['nur\ture\php\impl\ntsimple',
['nur\sery\php\impl\ntsimple',
false, null, null,
false, null, null,
],
@ -412,7 +412,7 @@ namespace nur\ture\php {
false, null, null,
false, null, null,
],
[['nur\ture\php\impl\ntsimple'],
[['nur\sery\php\impl\ntsimple'],
false, null, null,
false, null, null,
],
@ -461,7 +461,7 @@ namespace nur\ture\php {
true, false, [null, "tsimple"],
true, false, [null, "tsimple"],
],
[[null, 'nur\ture\php\impl\ntsimple'],
[[null, 'nur\sery\php\impl\ntsimple'],
false, null, null,
false, null, null,
],
@ -489,7 +489,7 @@ namespace nur\ture\php {
false, null, null,
false, null, null,
],
[[false, 'nur\ture\php\impl\ntsimple'],
[[false, 'nur\sery\php\impl\ntsimple'],
false, null, null,
false, null, null,
],
@ -517,7 +517,7 @@ namespace nur\ture\php {
false, null, null,
false, null, null,
],
[["", 'nur\ture\php\impl\ntsimple'],
[["", 'nur\sery\php\impl\ntsimple'],
false, null, null,
false, null, null,
],
@ -637,7 +637,7 @@ namespace nur\ture\php {
false, null, null,
false, null, null,
],
['nur\ture\php\impl\ntsimple',
['nur\sery\php\impl\ntsimple',
false, null, null,
false, null, null,
],
@ -714,7 +714,7 @@ namespace nur\ture\php {
false, null, null,
false, null, null,
],
[['nur\ture\php\impl\ntsimple'],
[['nur\sery\php\impl\ntsimple'],
false, null, null,
false, null, null,
],
@ -763,7 +763,7 @@ namespace nur\ture\php {
true, false, [null, "tsimple"],
true, false, [null, "tsimple"],
],
[[null, 'nur\ture\php\impl\ntsimple'],
[[null, 'nur\sery\php\impl\ntsimple'],
false, null, null,
false, null, null,
],
@ -791,7 +791,7 @@ namespace nur\ture\php {
false, null, null,
false, null, null,
],
[[false, 'nur\ture\php\impl\ntsimple'],
[[false, 'nur\sery\php\impl\ntsimple'],
false, null, null,
false, null, null,
],
@ -819,7 +819,7 @@ namespace nur\ture\php {
false, null, null,
false, null, null,
],
[["", 'nur\ture\php\impl\ntsimple'],
[["", 'nur\sery\php\impl\ntsimple'],
false, null, null,
false, null, null,
],
@ -1123,7 +1123,7 @@ namespace {
function to1v($b=9, ...$c): array { return [$b, ...$c]; }
}
namespace nur\ture\php\impl {
namespace nur\sery\php\impl {
function ntsimple(): int { return 0; }
class SC {

View File

@ -12,7 +12,7 @@ namespace {
function func_o1v($b=9, ...$c): array { return [$b, ...$c]; }
}
namespace nur\ture\php {
namespace nur\sery\php {
use nulib\tests\TestCase;

View File

@ -1,5 +1,5 @@
<?php
namespace nur\ture\php\time;
namespace nur\sery\php\time;
use DateTimeZone;
use nulib\tests\TestCase;

View File

@ -1,5 +1,5 @@
<?php
namespace nur\ture\php\time;
namespace nur\sery\php\time;
use DateTimeZone;
use nulib\tests\TestCase;

View File

@ -1,5 +1,5 @@
<?php
namespace nur\ture\php\time;
namespace nur\sery\php\time;
use DateTimeZone;
use nulib\tests\TestCase;

View File

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

View File

@ -1,10 +1,10 @@
<?php
namespace nur\ture\schema\types;
namespace nur\sery\schema\types;
use Exception;
use nulib\tests\TestCase;
use nur\ture\schema\_scalar\ScalarValue;
use nur\ture\schema\Schema;
use nur\sery\schema\_scalar\ScalarValue;
use nur\sery\schema\Schema;
class boolTest extends TestCase {
function commonTests($destv, &$dest, callable $destvSetter): void {

View File

@ -1,10 +1,10 @@
<?php
namespace nur\ture\schema\types;
namespace nur\sery\schema\types;
use Exception;
use nulib\tests\TestCase;
use nur\ture\schema\_scalar\ScalarValue;
use nur\ture\schema\Schema;
use nur\sery\schema\_scalar\ScalarValue;
use nur\sery\schema\Schema;
class floatTest extends TestCase {
function commonTests($destv, &$dest, callable $destvSetter): void {

View File

@ -1,10 +1,10 @@
<?php
namespace nur\ture\schema\types;
namespace nur\sery\schema\types;
use Exception;
use nulib\tests\TestCase;
use nur\ture\schema\_scalar\ScalarValue;
use nur\ture\schema\Schema;
use nur\sery\schema\_scalar\ScalarValue;
use nur\sery\schema\Schema;
class intTest extends TestCase {
function commonTests($destv, &$dest, callable $destvSetter): void {

View File

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

View File

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

View File

@ -1,6 +1,6 @@
<?php
namespace nur\ture;
namespace nur\sery;
use nulib\tests\TestCase;

View File

@ -1,5 +1,5 @@
<?php
namespace nur\ture\web;
namespace nur\sery\web;
use PHPUnit\Framework\TestCase;