From f005692cd8ce34099600d820461858c0dada2457 Mon Sep 17 00:00:00 2001 From: Jephte Clain Date: Fri, 4 Apr 2025 06:35:07 +0400 Subject: [PATCH] =?UTF-8?q?d=C3=A9placer=20nur/sery/wip=20et=20nur/sery=20?= =?UTF-8?q?dans=20nulib?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/nur-ture.iml | 6 ++-- composer.json | 6 ++-- composer.lock | 2 +- nur_bin/steam-train.php | 2 +- nur_src/cli/Application.php | 2 +- nur_src/ref/ref_type.php | 2 +- nur_tbin/base/test-args4.php | 2 +- {src_app => src}/app.php | 4 +-- {src_app => src}/app/cli/Application.php | 4 +-- {src_app => src}/app/cli/TODO.md | 0 src/php/access/AbstractAccess.php | 2 +- src/php/access/ArrayAccess.php | 2 +- src/php/access/ChainAccess.php | 2 +- src/php/access/FormAccess.php | 2 +- src/php/access/GetAccess.php | 2 +- src/php/access/IAccess.php | 2 +- src/php/access/IDeleter.php | 2 +- src/php/access/IGetter.php | 2 +- src/php/access/ISetter.php | 2 +- src/php/access/KeyAccess.php | 2 +- src/php/access/PostAccess.php | 2 +- src/php/access/PropertyAccess.php | 2 +- src/php/access/ShadowAccess.php | 2 +- src/php/access/ValueAccess.php | 2 +- src/php/coll/Cursor.php | 4 +-- src/php/iter.php | 2 +- src/schema/OldSchema.php | 2 +- src/schema/Result.php | 2 +- src/schema/Schema.php | 22 ++++++------- src/schema/SchemaException.php | 2 +- src/schema/Wrapper.php | 14 ++++---- src/schema/WrapperContext.php | 6 ++-- src/schema/_assoc/AssocSchema.php | 6 ++-- src/schema/_assoc/AssocWrapper.php | 16 +++++----- src/schema/_assoc/AssocWrapperContext.php | 8 ++--- src/schema/_list/ListResult.php | 4 +-- src/schema/_list/ListSchema.php | 6 ++-- src/schema/_list/ListWrapper.php | 6 ++-- src/schema/_scalar/ScalarResult.php | 8 ++--- src/schema/_scalar/ScalarSchema.php | 6 ++-- src/schema/_scalar/ScalarWrapper.php | 12 +++---- src/schema/input/FormInput.php | 8 ++--- src/schema/input/GetInput.php | 6 ++-- src/schema/input/Input.php | 8 ++--- src/schema/input/PostInput.php | 6 ++-- src/schema/types.php | 32 +++++++++---------- src/schema/types/IType.php | 8 ++--- src/schema/types/Registry.php | 2 +- src/schema/types/_tformatable.php | 2 +- src/schema/types/_tsimple.php | 4 +-- src/schema/types/_tstring.php | 2 +- src/schema/types/_tunion.php | 2 +- src/schema/types/tarray.php | 10 +++--- src/schema/types/tbool.php | 12 +++---- src/schema/types/tcontent.php | 10 +++--- src/schema/types/tfloat.php | 10 +++--- src/schema/types/tfunc.php | 10 +++--- src/schema/types/tgeneric.php | 12 +++---- src/schema/types/tint.php | 10 +++--- src/schema/types/tkey.php | 10 +++--- src/schema/types/tmixed.php | 12 +++---- src/schema/types/tpkey.php | 10 +++--- src/schema/types/traw.php | 4 +-- src/schema/types/trawstring.php | 10 +++--- src/schema/types/tstring.php | 2 +- src/schema/types/ttext.php | 2 +- {src_glue => src}/tools/Csv2xlsxApp.php | 0 {src_glue => src}/tools/DumpserApp.php | 0 src/web/content/Tag.php | 2 +- src/web/content/v.php | 2 +- src_glue/app.php | 5 --- src_glue/app/cli/Application.php | 5 --- tests/{wip => }/php/access/KeyAccessTest.php | 2 +- tests/{wip => }/php/coll/CursorTest.php | 2 +- tests/{wip => }/php/content/cTest.php | 6 ++-- tests/{wip => }/php/content/impl/AContent.php | 2 +- .../{wip => }/php/content/impl/APrintable.php | 2 +- tests/{wip => }/php/content/impl/ATag.php | 2 +- tests/{wip => }/php/content/impl/html.php | 2 +- .../schema/_assoc/AssocSchemaTest.php | 6 ++-- .../schema/_scalar/ScalarSchemaTest.php | 4 +-- .../schema/_scalar/ScalarWrapperTest.php | 4 +-- tests/{wip => }/schema/types/boolTest.php | 6 ++-- tests/{wip => }/schema/types/floatTest.php | 6 ++-- tests/{wip => }/schema/types/intTest.php | 6 ++-- tests/{wip => }/schema/types/strTest.php | 6 ++-- tests/{wip => }/schema/types/unionTest.php | 6 ++-- 87 files changed, 225 insertions(+), 239 deletions(-) rename {src_app => src}/app.php (99%) rename {src_app => src}/app/cli/Application.php (99%) rename {src_app => src}/app/cli/TODO.md (100%) rename {src_glue => src}/tools/Csv2xlsxApp.php (100%) rename {src_glue => src}/tools/DumpserApp.php (100%) delete mode 100644 src_glue/app.php delete mode 100644 src_glue/app/cli/Application.php rename tests/{wip => }/php/access/KeyAccessTest.php (99%) rename tests/{wip => }/php/coll/CursorTest.php (99%) rename tests/{wip => }/php/content/cTest.php (92%) rename tests/{wip => }/php/content/impl/AContent.php (79%) rename tests/{wip => }/php/content/impl/APrintable.php (77%) rename tests/{wip => }/php/content/impl/ATag.php (90%) rename tests/{wip => }/php/content/impl/html.php (91%) rename tests/{wip => }/schema/_assoc/AssocSchemaTest.php (98%) rename tests/{wip => }/schema/_scalar/ScalarSchemaTest.php (96%) rename tests/{wip => }/schema/_scalar/ScalarWrapperTest.php (99%) rename tests/{wip => }/schema/types/boolTest.php (96%) rename tests/{wip => }/schema/types/floatTest.php (97%) rename tests/{wip => }/schema/types/intTest.php (97%) rename tests/{wip => }/schema/types/strTest.php (96%) rename tests/{wip => }/schema/types/unionTest.php (83%) diff --git a/.idea/nur-ture.iml b/.idea/nur-ture.iml index ae13f26..e8b45d5 100644 --- a/.idea/nur-ture.iml +++ b/.idea/nur-ture.iml @@ -4,10 +4,8 @@ - - - - + + diff --git a/composer.json b/composer.json index dcc65a0..796d0c3 100644 --- a/composer.json +++ b/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" } }, diff --git a/composer.lock b/composer.lock index aaa6402..27a5e88 100644 --- a/composer.lock +++ b/composer.lock @@ -589,7 +589,7 @@ "dist": { "type": "path", "url": "../nulib", - "reference": "2cdc05981013dc403afe26c08f3cfef36f737642" + "reference": "1536e091fb0020858204f59462a7a80b5f9775d9" }, "require": { "ext-json": "*", diff --git a/nur_bin/steam-train.php b/nur_bin/steam-train.php index dbde68a..7d032dc 100755 --- a/nur_bin/steam-train.php +++ b/nur_bin/steam-train.php @@ -2,6 +2,6 @@