maj nulib-base

nur_bin/datectl.php

@@ -2,9 +2,9 @@
 <?php
 require $_composer_autoload_path?? __DIR__.'/../vendor/autoload.php';
 
+use nur\b\date\Datetime;
 use nur\b\IllegalAccessException;
 use nur\cli\Application;
-use nur\b\date\Datetime;
 use nur\data\types\SDatetimeType;
 
 Application::run(new class extends Application {

nur_bin/dumpser.php

@@ -2,11 +2,9 @@
 <?php
 require $_composer_autoload_path?? __DIR__.'/../vendor/autoload.php';
 
-use nur\b\io\CacheFile;
 use nur\b\io\SharedFile;
 use nur\cli\Application;
 use nur\msg;
-use nur\path;
 use nur\yaml;
 
 Application::run(new class extends Application {

nur_src/b/authnz/AuthzManager.php

@@ -16,7 +16,6 @@ use nur\v\page;
 use nur\v\v;
 use nur\v\vo;
 use nur\v\vp\AInitAuthzPage;
-use nur\v\vp\AInitPage;
 
 /**
  * Interface IAuthzManager: gestionnaire d'authentification et d'autorisation

nur_src/b/io/FileCachedValue.php

@@ -6,6 +6,8 @@ use Countable;
 use Exception;
 use Generator;
 use nulib\file\Stream;
+use nulib\php\time\DateTime;
+use nulib\php\time\Delay;
 use nur\A;
 use nur\b\coll\TBaseArray;
 use nur\b\IllegalAccessException;
@@ -14,8 +16,6 @@ use nur\b\params\Tparametrable;
 use nur\data\types\Tmd;
 use nur\file;
 use nur\os;
-use nulib\php\time\DateTime;
-use nulib\php\time\Delay;
 
 /**
  * Class FileCachedValue: un fichier utilisé pour mettre en cache certaines

nur_src/cli/Application.php

@@ -6,10 +6,13 @@ use nulib\app\app;
 use nulib\app\RunFile;
 use nulib\ExitError;
 use nulib\ext\yaml;
-use nulib\output\console as nconsole;
+use nulib\output\con as ncon;
 use nulib\output\log as nlog;
 use nulib\output\msg as nmsg;
-use nulib\output\std\StdMessenger;
+use nulib\output\say as nsay;
+use nulib\output\std\ConsoleMessenger;
+use nulib\output\std\LogMessenger;
+use nulib\output\std\ProxyMessenger;
 use nur\b\ExitError as nur_ExitError;
 use nur\b\ValueException;
 use nur\config;
@@ -172,9 +175,11 @@ EOT);
     }
 
     app::init(static::class);
-    nmsg::set_messenger(new StdMessenger([
+    $con = new ConsoleMessenger([
       "min_level" => nmsg::DEBUG,
-    ]));
+    ]);
+    nsay::set_messenger($con);
+    nmsg::set_messenger($con);
   }
 
   protected static function _app_configure(Application $app): void {
@@ -183,17 +188,20 @@ EOT);
     # initiale est faite
     msg::get()->setLevels(msg::PRINT_LEVELS, msg::LOG_LEVELS, msg::TYPE_LEVELS);
 
-    $msgs = ["console" => new StdMessenger([
+    $con = ncon::set_messenger(new ConsoleMessenger([
-      "min_level" => nmsg::NORMAL,
+      "min_level" => ncon::NORMAL,
-    ])];
+    ]));
+    nsay::set_messenger($con, true);
+    nmsg::set_messenger($con, true);
     if (static::USE_LOGFILE) {
-      $msgs["log"] = new StdMessenger([
+      $log = nlog::set_messenger(new LogMessenger([
         "output" => app::get()->getLogfile(),
         "min_level" => nmsg::MINOR,
-        "add_date" => true,
+      ]));
-      ]);
+    } else {
+      $log = nlog::set_messenger(new ProxyMessenger());
     }
-    nmsg::init($msgs);
+    nmsg::set_messenger($log);
 
     $app->parseArgs();
     config::configure();
@@ -282,14 +290,15 @@ EOT);
         "action" => [null, "set_application_profile"],
         "help" => "spécifier le profil d'exécution",
       ],
-      ["-P", "--prod", "action" => [config::class, "set_profile", config::PROD]],
+      ["-P", "--prod", "action" => [null, "set_application_profile", config::PROD]],
-      ["-T", "--test", "action" => [config::class, "set_profile", config::TEST]],
+      ["-T", "--test", "action" => [null, "set_application_profile", config::TEST]],
-      ["--devel", "action" => [config::class, "set_profile", config::DEVEL]],
+      ["--devel", "action" => [null, "set_application_profile", config::DEVEL]],
     ],
   ];
 
   static function set_application_profile(string $profile): void {
     config::set_profile($profile);
+    app::set_profile($profile);
   }
 
   const VERBOSITY_SECTION = [
@@ -322,7 +331,6 @@ EOT);
 
   static function set_application_verbosity(string $verbosity): void {
     $msg = msg::get();
-    $nconsole = nconsole::get();
     switch ($verbosity) {
     case "s":
     case "silent":
@@ -331,9 +339,7 @@ EOT);
         msg::TECH => msg::NEVER,
         msg::EXCEPTION => msg::NEVER,
       ]);
-      $nconsole->resetParams([
+      ncon::set_verbosity("silent");
-        "min_level" => nmsg::NONE,
-      ]);
       break;
     case "Q":
     case "very-quiet":
@@ -342,9 +348,7 @@ EOT);
         msg::TECH => msg::CRITICAL,
         msg::EXCEPTION => msg::NEVER,
       ]);
-      $nconsole->resetParams([
+      ncon::set_verbosity("quiet");
-        "min_level" => nmsg::MAJOR,
-      ]);
       break;
     case "q":
     case "quiet":
@@ -353,9 +357,7 @@ EOT);
         msg::TECH => msg::MAJOR,
         msg::EXCEPTION => msg::NEVER,
       ]);
-      $nconsole->resetParams([
+      ncon::set_verbosity("quiet");
-        "min_level" => nmsg::MAJOR,
-      ]);
       break;
     case "v":
     case "verbose":
@@ -364,9 +366,7 @@ EOT);
         msg::TECH => msg::MINOR,
         msg::EXCEPTION => msg::NEVER,
       ]);
-      $nconsole->resetParams([
+      ncon::set_verbosity("verbose");
-        "min_level" => nmsg::MINOR,
-      ]);
       break;
     case "D":
     case "debug":
@@ -376,9 +376,7 @@ EOT);
         msg::TECH => msg::MINOR,
         msg::EXCEPTION => msg::NORMAL,
       ], null, msg::DEBUG);
-      $nconsole->resetParams([
+      ncon::set_verbosity("debug");
-        "min_level" => nmsg::DEBUG,
-      ]);
       break;
     case "T":
     case "trace":
@@ -388,9 +386,7 @@ EOT);
         msg::TECH => msg::MINOR,
         msg::EXCEPTION => msg::MINOR,
       ], null, msg::DEBUG);
-      $nconsole->resetParams([
+      ncon::set_verbosity("debug");
-        "min_level" => nmsg::DEBUG,
-      ]);
       break;
     default:
       throw ValueException::invalid_value($verbosity, "verbosity");
@@ -403,18 +399,13 @@ EOT);
 
   static function set_application_log_output(string $logfile): void {
     msg::get()->setParametrableParams(["log_output" => $logfile]);
-    nlog::create_or_reset_params([
+    nlog::reset_params([
       "output" => $logfile,
-    ], StdMessenger::class, [
-      "add_date" => true,
-      "min_level" => nlog::MINOR,
     ]);
   }
   static function set_application_color(bool $color): void {
     msg::get()->setParametrableParams(["color" => $color]);
-    nconsole::reset_params([
+    ncon::set_color($color);
-      "color" => $color,
-    ]);
   }
   const ARGS = [
     "sections" => [

nur_src/ldap/LdapSearch.php

@@ -2,6 +2,7 @@
 namespace nur\ldap;
 
 use IteratorAggregate;
+use nulib\output\msg;
 use nur\A;
 use nur\b\params\Parametrable;
 use nur\b\params\Tparametrable;
@@ -10,7 +11,6 @@ use nur\b\ValueException;
 use nur\data\types\md_utils;
 use nur\data\types\Metadata;
 use nur\iter;
-use nulib\output\msg;
 
 class LdapSearch extends Parametrable implements IteratorAggregate {
   use Tparametrable;

nur_src/ldap/app/LdapDeleteApp.php

@@ -1,9 +1,9 @@
 <?php
 namespace nur\ldap\app;
 
+use nulib\output\msg;
 use nur\ldap\LdapSearch;
 use nur\ldap\LdapWalker;
-use nulib\output\msg;
 
 class LdapDeleteApp extends LdapApplication {
   const ARGS = [

nur_src/ldap/ldap_server.php

@@ -1,11 +1,11 @@
 <?php
 namespace nur\ldap;
 
+use nulib\output\msg;
 use nur\A;
 use nur\b\ValueException;
 use nur\config;
 use nur\path;
-use nulib\output\msg;
 use nur\SL;
 
 abstract class ldap_server {

nur_src/m/pdo/mysql/MysqlQuery.php

@@ -1,10 +1,10 @@
 <?php
 namespace nur\m\pdo\mysql;
 
+use nulib\db\mysql\query;
 use nur\m\IQuery;
 use nur\m\IRowIncarnation;
 use nur\m\pdo\PdoQuery;
-use nulib\db\mysql\query;
 
 class MysqlQuery extends PdoQuery {
   protected function newRowIncarnation(): IRowIncarnation {

nur_src/m/pgsql/PgsqlConn.php

@@ -1,7 +1,6 @@
 <?php
 namespace nur\m\pgsql;
 
-use nur\base;
 use nur\config;
 use nur\debug;
 use nur\m\base\AbstractConn;

nur_src/v/base/AbstractPageContainer.php

@@ -20,7 +20,6 @@ use nur\v\page;
 use nur\v\prefix;
 use nur\v\vo;
 use Throwable;
-use Traversable;
 
 abstract class AbstractPageContainer implements IPageContainer {
   protected static function ensure_preparec(IComponent $c, bool $afterPrepare=false): bool {

nur_src/v/bs3/vc/CTable.php

@@ -2,12 +2,9 @@
 namespace nur\v\bs3\vc;
 
 use Exception;
-use Iterator;
 use nur\A;
-use nur\b\coll\BaseArray;
 use nur\b\params\IParametrable;
 use nur\b\params\Tparametrable1;
-use nur\b\ValueException;
 use nur\data\types\md_utils;
 use nur\data\types\Metadata;
 use nur\func;

nur_src/v/html5/Html5NavigablePageContainer.php

@@ -2,7 +2,6 @@
 namespace nur\v\html5;
 
 use nur\co;
-use nur\session;
 use nur\v\ly;
 use nur\v\model\IBasicPage;
 use nur\v\model\INavigablePage;

nur_src/v/html5/Html5VanillaPageContainer.php

@@ -12,7 +12,6 @@ use nur\v\base\AbstractPageContainer;
 use nur\v\base\MenuManager;
 use nur\v\fo;
 use nur\v\ly;
-use nur\v\model\IBasicPage;
 use nur\v\model\IComponent;
 use nur\v\model\IPage;
 use nur\v\model\IPlugin;

nur_tbin/base/test-args4.php

@@ -1,8 +1,8 @@
 <?php # -*- coding: utf-8 mode: php -*- vim:sw=2:sts=2:et:ai:si:sta:fenc=utf-8
 require(__DIR__.'/../../vendor/autoload.php');
 
-use nur\cli\Application;
 use nulib\output\msg;
+use nur\cli\Application;
 
 class TestArgs4 extends Application {
   protected $query;

tbin/legacy-test-console.php

@@ -2,9 +2,9 @@
 <?php
 require(__DIR__.'/../vendor/autoload.php');
 
-use nur\cli\Application;
 use nulib\output\msg;
 use nulib\UserException;
+use nur\cli\Application;
 
 Application::run(new class extends Application {
   function main() {

tbin/legacy-test-levels.php

@@ -2,10 +2,10 @@
 <?php
 require(__DIR__.'/../vendor/autoload.php');
 
-use nur\cli\Application;
 use nulib\output\IMessenger;
 use nulib\output\msg;
 use nulib\ValueException;
+use nur\cli\Application;
 
 Application::run(new class extends Application {
   function main() {

tbin/legacy-test-nested-actions.php

@@ -2,10 +2,9 @@
 <?php
 require(__DIR__.'/../vendor/autoload.php');
 
-use nur\cli\Application;
 use nulib\output\IMessenger;
 use nulib\output\msg;
-use nulib\UserException;
+use nur\cli\Application;
 
 Application::run(new class extends Application {
   function main() {

tests/php/coll/CursorTest.php

@@ -3,16 +3,10 @@ namespace nulib\php\coll;
 
 use Exception;
 use nulib\cl;
-use nulib\output\msg;
-use nulib\output\std\StdMessenger;
 use nulib\tests\TestCase;
 use TypeError;
 
 class CursorTest extends TestCase {
-  protected function setUp(): void {
-    msg::set_messenger(new StdMessenger());
-  }
-
   function test_map_row() {
     $cursor = new class extends Cursor {
       function mapRow(array $row, ?array $map): array {

tests/php/content/cTest.php

@@ -1,7 +1,6 @@
 <?php
 namespace nulib\php\content;
 
-use nulib\php\content\c;
 use nulib\php\content\impl\html;
 use nulib\web\content\v;
 use PHPUnit\Framework\TestCase;

tests/schema/_assoc/AssocSchemaTest.php

@@ -1,12 +1,10 @@
 <?php
 namespace nulib\schema\_assoc;
 
-use nulib\ext\yaml;
-use nulib\tests\TestCase;
-use nulib\ValueException;
 use nulib\schema\_scalar\ScalarSchemaTest;
 use nulib\schema\Schema;
-use PHPStan\Type\Enum\EnumCaseObjectType;
+use nulib\tests\TestCase;
+use nulib\ValueException;
 
 class AssocSchemaTest extends TestCase {
   const NULL_SCHEMA = [

tests/schema/_scalar/ScalarSchemaTest.php

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

tests/schema/_scalar/ScalarWrapperTest.php

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

tests/schema/types/boolTest.php

@@ -2,9 +2,9 @@
 namespace nulib\schema\types;
 
 use Exception;
-use nulib\tests\TestCase;
 use nulib\schema\_scalar\ScalarWrapper;
 use nulib\schema\Schema;
+use nulib\tests\TestCase;
 
 class boolTest extends TestCase {
   function commonTests($wrapper, &$value, callable $wrapperSetter): void {

tests/schema/types/floatTest.php

@@ -2,9 +2,9 @@
 namespace nulib\schema\types;
 
 use Exception;
-use nulib\tests\TestCase;
 use nulib\schema\_scalar\ScalarWrapper;
 use nulib\schema\Schema;
+use nulib\tests\TestCase;
 
 class floatTest extends TestCase {
   function commonTests($wrapper, &$value, callable $wrapperSetter): void {

tests/schema/types/intTest.php

@@ -2,9 +2,9 @@
 namespace nulib\schema\types;
 
 use Exception;
-use nulib\tests\TestCase;
 use nulib\schema\_scalar\ScalarWrapper;
 use nulib\schema\Schema;
+use nulib\tests\TestCase;
 
 class intTest extends TestCase {
   function commonTests($wrapper, &$value, callable $wrapperSetter): void {

tests/schema/types/strTest.php

@@ -2,9 +2,9 @@
 namespace nulib\schema\types;
 
 use Exception;
-use nulib\tests\TestCase;
 use nulib\schema\_scalar\ScalarWrapper;
 use nulib\schema\Schema;
+use nulib\tests\TestCase;
 
 class strTest extends TestCase {
   function commonTests($wrapper, &$value, callable $wrapperSetter): void {

tests/schema/types/unionTest.php

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