sda-php/nur-sery
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

modifs.mineures sans commentaires

Browse Source
This commit is contained in:
Jephté Clain 2024-05-16 17:51:05 +04:00
parent 64e18fdcc2
commit 4d883690cb
5 changed files with 46 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
nur_src/ldap/IObjectWorkflow.php
View File

@ -11,9 +11,11 @@ interface IObjectWorkflow {
/** /**
* synchroniser les données spécifiées vers l'objet correspndant, en le créant * synchroniser les données spécifiées vers l'objet correspndant, en le créant
* si nécessaire * si nécessaire.
*
* $updated=true si l'objet a été créé ou mis à jour, false sinon
*/ */
function createOrUpdate(array $data, ?array $params=null): LdapObject; function createOrUpdate(array $data, ?array $params=null, ?bool &$updated=null): LdapObject;
/** /**
* modifier uniquement le mot de passe de l'objet correspondant * modifier uniquement le mot de passe de l'objet correspondant

4
nur_src/v/icon.php
View File

@ -56,6 +56,7 @@ class icon {
static final function config(?string $suffix=null, ?string $alt=null): array { return self::manager()->getIcon("config", $suffix, $alt); } static final function config(?string $suffix=null, ?string $alt=null): array { return self::manager()->getIcon("config", $suffix, $alt); }
static final function save(?string $suffix=null, ?string $alt=null): array { return self::manager()->getIcon("save", $suffix, $alt); } static final function save(?string $suffix=null, ?string $alt=null): array { return self::manager()->getIcon("save", $suffix, $alt); }
static final function download(?string $suffix=null, ?string $alt=null): array { return self::manager()->getIcon("download", $suffix, $alt); } static final function download(?string $suffix=null, ?string $alt=null): array { return self::manager()->getIcon("download", $suffix, $alt); }
static final function bin(?string $suffix=null, ?string $alt=null): array { return self::manager()->getIcon("bin", $suffix, $alt); }
static final function mail(?string $suffix=null, ?string $alt=null): array { return self::manager()->getIcon("mail", $suffix, $alt); } static final function mail(?string $suffix=null, ?string $alt=null): array { return self::manager()->getIcon("mail", $suffix, $alt); }
static final function search(?string $suffix=null, ?string $alt=null): array { return self::manager()->getIcon("search", $suffix, $alt); } static final function search(?string $suffix=null, ?string $alt=null): array { return self::manager()->getIcon("search", $suffix, $alt); }
static final function user(?string $suffix=null, ?string $alt=null): array { return self::manager()->getIcon("user", $suffix, $alt); } static final function user(?string $suffix=null, ?string $alt=null): array { return self::manager()->getIcon("user", $suffix, $alt); }
@ -89,6 +90,9 @@ class icon {
static final function heart(?string $suffix=null, ?string $alt=null): array { return self::manager()->getIcon("heart", $suffix, $alt); } static final function heart(?string $suffix=null, ?string $alt=null): array { return self::manager()->getIcon("heart", $suffix, $alt); }
static final function heart_empty(?string $suffix=null, ?string $alt=null): array { return self::manager()->getIcon("heart_empty", $suffix, $alt); } static final function heart_empty(?string $suffix=null, ?string $alt=null): array { return self::manager()->getIcon("heart_empty", $suffix, $alt); }
static final function plus(?string $suffix=null, ?string $alt=null): array { return self::manager()->getIcon("plus", $suffix, $alt); }
static final function minus(?string $suffix=null, ?string $alt=null): array { return self::manager()->getIcon("minus", $suffix, $alt); }
# template: # template:
#static final function xxx(?string $suffix=null, ?string $alt=null): array { return self::manager()->getIcon("xxx", $suffix, $alt); } #static final function xxx(?string $suffix=null, ?string $alt=null): array { return self::manager()->getIcon("xxx", $suffix, $alt); }
} }

2
src/output/std/ProxyMessenger.php
View File

@ -78,7 +78,7 @@ class ProxyMessenger implements IMessenger {
$msg->action($content, null, $level); $msg->action($content, null, $level);
if ($msg instanceof _IMessenger) { if ($msg instanceof _IMessenger) {
$useFunc = true; $useFunc = true;
$untils[] = $msg->_getTitleMark(); $untils[] = $msg->_getActionMark();
} }
} }
if ($useFunc && $func !== null) { if ($useFunc && $func !== null) {

3
src/output/std/StdMessenger.php
View File

@ -584,6 +584,9 @@ class StdMessenger implements _IMessenger {
elseif ($result === false) $this->afailure(); elseif ($result === false) $this->afailure();
else $this->adone($result); else $this->adone($result);
} }
} catch (Exception $e) {
$this->afailure($e);
throw $e;
} finally { } finally {
$this->_endAction($until); $this->_endAction($until);
} }

34
tbin/legacy-test-action.php Executable file
View File

@ -0,0 +1,34 @@
#!/usr/bin/php
<?php
require(__DIR__.'/../vendor/autoload.php');
use nur\cli\Application;
use nur\sery\output\IMessenger;
use nur\sery\output\msg;
use nur\sery\UserException;
Application::run(new class extends Application {
function main() {
msg::section("ma section");
msg::action("first", function (IMessenger $msg) {
msg::action("second", function (IMessenger $msg) {
msg::action("third", function (IMessenger $msg) {
$msg->info("hello world");
$msg->asuccess(null, msg::DEBUG);
});
$msg->asuccess();
});
$msg->asuccess(null, msg::DEBUG);
});
msg::action("first2", function (IMessenger $msg) {
msg::action("second2", function (IMessenger $msg) {
msg::action("third2", function (IMessenger $msg) {
$msg->info("hello world2");
$msg->asuccess(null, msg::DEBUG);
});
$msg->asuccess();
});
$msg->asuccess(null, msg::DEBUG);
});
}
});