diff --git a/CHANGES.md b/CHANGES.md index a8633fc..f9c457f 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,3 +1,11 @@ +## Release 0.7.0p74 du 22/10/2025-18:33 + +* `5e41e7d` gestion simplifiée des schéma +* `efb4f03` importation Hour et Time et d'autres vclasses +* `4f0d6d4` function isa() pour les vclasses +* `cfb8f0d` corriger la prise en compte des configurations de branche +* nombreuses autres modifications non documentées ici + ## Release 0.6.1p82 du 03/06/2025-10:22 ## Release 0.6.1p74 du 03/06/2025-10:21 diff --git a/VERSION.txt b/VERSION.txt index ee6cdce..faef31a 100644 --- a/VERSION.txt +++ b/VERSION.txt @@ -1 +1 @@ -0.6.1 +0.7.0 diff --git a/bash/src/pman.sh b/bash/src/pman.sh index 41e2da9..3250e4f 100644 --- a/bash/src/pman.sh +++ b/bash/src/pman.sh @@ -366,7 +366,8 @@ function load_config() { ac_set_tmpfile config git show "$ConfigBranch:.pman.conf" >"$config" 2>/dev/null [ -s "$config" ] || die "$ConfigBranch: aucune configuration trouvée sur cette branche" || return - source "$config" + ConfigFile="$config" + source "$ConfigFile" fi elif [ -f .pman.conf ]; then ConfigFile="$(pwd)/.pman.conf" @@ -681,9 +682,7 @@ function _create_upstream_action() { # faire une copie de la configuration actuelle local config; ac_set_tmpfile config - set -x; ls -l "$ConfigFile" #XXX cp "$ConfigFile" "$config" - set +x #XXX einfo "Création de la branche $RefBranch" git checkout --orphan "$RefBranch" || die diff --git a/bin/_merge82 b/bin/_merge82 index 7a4cac4..e1afdeb 100755 --- a/bin/_merge82 +++ b/bin/_merge82 @@ -9,4 +9,4 @@ args=( ) parse_args "$@"; set -- "${args[@]}" -exec "$MYDIR/ptool" -fupstream -Bdev82 -m --tech-merge ${dev74:+-a "git checkout dev74"} "$@" +exec "$MYDIR/ptool" -fupstream -Bdev82 --tech-merge ${dev74:+-a "git checkout dev74"} "$@" diff --git a/bin/ptool b/bin/ptool index c1cd363..3025df9 100755 --- a/bin/ptool +++ b/bin/ptool @@ -221,6 +221,9 @@ if check_gitdir; then set_pman_vars "$merge_dir" load_branches current loaded_config=1 + # remettre à zéro ConfigFile pour ne pas influencer le rechargement plus bas + oConfigFile="$ConfigFile" + ConfigFile= else set_pman_vars "$merge_dir" fi @@ -377,6 +380,9 @@ if [ -z "$loaded_config" -o -n "$chdir" -o -n "$ConfigFile" -o -n "$ConfigBranch load_config set_pman_vars "$merge_dir" load_branches current +else + # restaurer ConfigFile précédent + ConfigFile="$oConfigFile" fi resolve_should_push quiet diff --git a/php/src/mail/mailer.php b/php/src/mail/mailer.php index d11eb34..ac2e9ad 100644 --- a/php/src/mail/mailer.php +++ b/php/src/mail/mailer.php @@ -6,38 +6,26 @@ use nulib\cl; use nulib\cv; use nulib\exceptions; use nulib\output\msg; +use nulib\php\types\vbool; use nulib\str; use PHPMailer\PHPMailer\PHPMailer; use PHPMailer\PHPMailer\SMTP; class mailer { private static function is_bool(&$value): bool { - if ($value === null) { - return false; - } elseif (is_bool($value)) { + if ($value === null) return false; + elseif (is_bool($value)) return true; + elseif (is_numeric($value)) { + $value = $value != 0; return true; - } elseif (is_int($value)) { - $value = boolval($value); + } elseif (vbool::is_yes($value)) { + $value = true; + return true; + } elseif ($value === "" || vbool::is_no($value)) { + $value = false; return true; - } else { - switch (strval($value)) { - case "": - case "0": - case "no": - case "off": - case "false": - $value = false; - return true; - case "1": - case "yes": - case "on": - case "true": - $value = true; - return true; - default: - return false; - } } + return false; } private static function get_bool($value): bool { @@ -120,19 +108,14 @@ class mailer { $mailer->SMTPDebug = $debug; # auth, username, password $username = $params["username"] ?? null; - $username ??= cv::vn(getenv("NULIB_MAIL_USERNAME")); $password = $params["password"] ?? null; - $password ??= cv::vn(getenv("NULIB_MAIL_PASSWORD")); $auth = $params["auth"] ?? null; - $auth ??= cv::vn(getenv("NULIB_MAIL_AUTH")); $auth ??= $username !== null && $password !== null; $mailer->SMTPAuth = self::get_bool($auth); $mailer->Username = $username; $mailer->Password = $password; # secure - $secure = $params["secure"] ?? null; - $secure ??= cv::vn(getenv("NULIB_MAIL_SECURE")); - $secure ??= false; + $secure = $params["secure"] ?? false; if (self::is_bool($secure)) { if (!$secure) { $mailer->SMTPSecure = ""; diff --git a/php/src/php/time/Hour.php b/php/src/php/time/Hour.php new file mode 100644 index 0000000..72be43e --- /dev/null +++ b/php/src/php/time/Hour.php @@ -0,0 +1,16 @@ +getSeconds(); + } elseif (is_int($time)) { + return $time * $unit; + } elseif (is_string($time)) { + $matched = false; + foreach (self::PATTERNS as $pattern) { + if (preg_match($pattern, $time, $ms)) { + $matched = true; + break; + } + } + if ($matched) { + $h = $ms[1]; + $m = $ms[2] ?? 0; + $s = $ms[3] ?? 0; + return intval($h) * 3600 + intval($m) * 60 + intval($s); + } + } elseif ($time instanceof DateTimeInterface) { + $hms = $time->format('His'); + return intval(substr($hms, 0, 2)) * 3600 + + intval(substr($hms, 2, 2)) * 60 + + intval(substr($hms, 4, 2)); + } elseif (is_array($time) && count($time) == 3) { + [$h, $m, $s] = $time; + return $h * 3600 + $m * 60 + $s; + } + throw exceptions::invalid_value($time, "time"); + } + + protected static function s_adjust(int &$seconds, int $unit=self::UNIT_SECONDS, ?int $step=null): int { + if ($step !== null) $unit *= $step; + $adjust = $seconds % $unit; + if ($seconds < 0) $adjust = -$adjust; + $seconds -= $adjust; + return $seconds; + } + + protected static function s_wrap_start(int &$seconds): int { + while ($seconds < 0) $seconds += 86400; + if ($seconds >= 86400) $seconds %= 86400; + return $seconds; + } + + protected static function s_wrap_end(int &$seconds): int { + while ($seconds < 0) $seconds += 86400; + if ($seconds > 86400) $seconds %= 86400; + return $seconds; + } + + /** + * @var int la valeur de l'unité en secondes, pour le constructeur et les + * méthodes {@link setu()}, {@link addu()} et {@link subu()} + */ + const UNIT = self::UNIT_SECONDS; + + /** + * @var int|null un nombre d'unité dont l'heure doit être multiple. par + * exemple, si l'unité est la minute, une valeur 5 permet d'avoir des heures + * qui vont de 5 en 5 minutes (0h00, 0h05, 0h10, etc.) + */ + const STEP = null; + + /** @var bool s'il faut garder les heures dans la plage [0, 24h] */ + const WRAP = true; + + function __construct($time=null, ?array $params=null) { + $this->unit = vint::with($params["unit"] ?? static::UNIT); + $this->step = vint::withn($params["step"] ?? self::STEP); + $this->wrap = vbool::with($params["wrap"] ?? self::WRAP); + if ($time === null) $seconds = self::s_now(); + else $seconds = self::s_get($time, $this->unit); + $this->setSeconds($seconds); + } + + protected int $unit; + + protected ?int $step; + + protected bool $wrap; + + protected int $seconds; + + function getSeconds(): int { + return $this->seconds; + } + + /** + * mettre à jour cet objet avec le nombre de secondes spécifié + * + * le nombre effectif de secondes est calculé en tenant compte de l'unité + * actuelle + * + * @return int le nombre de seconde effectif, après correction + */ + protected function setSeconds(?int $seconds): int { + $this->seconds = $seconds ?? self::s_now(); + return $this->afterUpdate(); + } + + protected function afterUpdate(): int { + self::s_adjust($this->seconds, $this->unit, $this->step); + if ($this->wrap) $this->wrapEnd(); + return $this->seconds; + } + + /** + * wrapper l'heure pour la garder dans la plage [0h, 24h[ ce qui la rend + * propice à l'utilisation comme borne inférieure d'une période + */ + function wrapStart(): self { + self::s_wrap_start($this->seconds); + return $this; + } + + /** + * wrapper l'heure pour la garder dans la plage [0h, 24h] ce qui la rend + * propice à l'utilisation comme borne supérieure d'une période + */ + function wrapEnd(): self { + self::s_wrap_end($this->seconds); + return $this; + } + + /** formatter cette heure pour affichage */ + function format(?string $format=null): string { + if ($format === null) $format = static::FORMAT; + $v = $this->seconds; + $h = intdiv($v, 3600); $v = $v % 3600; + $m = intdiv($v, 60); + $s = $v % 60; + $searches = [ + "%H", "%h", + "%M", "%m", + "%S", "%s", + "%%", + ]; + $replaces = [ + sprintf("%02u", $h), strval($h), + sprintf("%02u", $m), strval($m), + sprintf("%02u", $s), strval($s), + "%", + ]; + return str_replace($searches, $replaces, $format); + } + + function __toString(): string { + return $this->format(); + } + + /** @return int le nombre d'unités */ + function getu(): int { + return intdiv($this->seconds, $this->unit); + } + + /** créer une nouvelle heure avec le nombre d'unités spécifiées */ + function setu(int $count): self { + $this->setSeconds($count * $this->unit); + return $this; + } + + /** créer une nouvelle heure en ajoutant à cette heure le nombre d'unités spécifiées */ + function addu(int $count=1): self { + $count *= $this->unit; + if ($this->step !== null) $count *= $this->step; + $this->setSeconds($this->seconds + $count); + return $this; + } + + /** créer une nouvelle heure en soustrayant à cette heure le nombre d'unités spécifiées */ + function subu(int $count=1): self { + $count *= $this->unit; + if ($this->step !== null) $count *= $this->step; + $this->setSeconds($this->seconds - $count); + return $this; + } + + /** forcer cette heure à l'heure spécifiée */ + function set($time): self { + if ($time === null) $seconds = self::s_now(); + else $seconds = self::with($time)->getSeconds(); + $this->setSeconds($seconds); + return $this; + } + + /** ajouter à cette heure l'heure spécifiée */ + function add($time): self { + if ($time !== null) { + $this->setSeconds($this->seconds + self::with($time)->getSeconds()); + } + return $this; + } + + /** soustraire à cette heure l'heure spécifiée */ + function sub($time): self { + if ($time !== null) { + $this->setSeconds($this->seconds - self::with($time)->getSeconds()); + } + return $this; + } + + /** + * comparer avec l'heure spécifiée. retourner une valeur négative, égale à + * zéro ou positive suivant le résultat de la comparaison + */ + function compare($time): int { + if ($time === null) return 1; + else return $this->seconds - self::with($time)->getSeconds(); + } + + /** + * tester si cette heure est avant ou égale à l'heure spécifiée + */ + function before($other): bool { + if ($other === null) return false; + else return $this->seconds <= self::with($other)->getSeconds(); + } + + /** + * tester si cette heure est après ou égale à l'heure spécifiée + */ + function after($other): bool { + if ($other === null) return true; + else return $this->seconds >= self::with($other)->getSeconds(); + } +} diff --git a/php/src/php/types/_schema.php b/php/src/php/types/_schema.php new file mode 100644 index 0000000..e0cc6e9 --- /dev/null +++ b/php/src/php/types/_schema.php @@ -0,0 +1,58 @@ + vrawstring::class, + "string" => vstring::class, + "text" => vtext::class, + "bool" => vbool::class, + "int" => vint::class, + "float" => vfloat::class, + "array" => varray::class, + "func" => vfunc::class, + "raw" => vraw::class, + "mixed" => vmixed::class, + "key" => vkey::class, + "pkey" => vpkey::class, + "content" => vcontent::class, + "datetime" => vdatetime::class, + "date" => vdate::class, + "time" => vtime::class, + ]; + + static function get_types($schema, &$default = null, ?bool &$required = null): array { + if (is_array($schema)) { + $types = $schema["type"] ?? $schema[0] ?? null; + $default = $schema["default"] ?? $schema[1] ?? null; + $required = vbool::with($schema["required"] ?? false); + } elseif (is_string($schema)) { + $types = $schema; + $default = null; + $required = false; + } else { + throw exceptions::invalid_value($schema, "schema"); + } + if (is_string($types)) { + $types = explode(",", $types); + } elseif (!is_array($types)) { + throw exceptions::invalid_value($types, "types"); + } + return $types; + } + + static function get_vclass(array $types, ?bool &$nullable): ?string { + foreach ($types as $type) { + $vclass = self::VCLASSES[$type] ?? null; + if ($vclass !== null) { + $nullable = str::del_prefix($type, "?"); + return $vclass; + } + } + return null; + } +} diff --git a/php/src/php/types/assoc.php b/php/src/php/types/assoc.php new file mode 100644 index 0000000..5380296 --- /dev/null +++ b/php/src/php/types/assoc.php @@ -0,0 +1,75 @@ + $kschema) { + $types = _schema::get_types($kschema, $default, $required); + $exists = array_key_exists($key, $array); + if (!$exists) { + if ($required) return false; + else continue; + } + $vclass = _schema::get_vclass($types, $nullable); + # le test échoue si le type n'est pas supporté + if ($vclass === null) return false; + $value = $array[$key]; + if ($value === null) { + if (!$nullable) return false; + } else { + if (!$vclass::isa($value, $strict)) return false; + } + } + return true; + } + + /** + * s'assurer que $array est conforme au schéma + * - les clés ne sont pas créées si elles n'existent pas, sauf si la valeur + * est requise ou si une valeur par défaut non nulle est fournie + */ + public static function ensure_schema(&$array, array $schema): bool { + $ensured = true; + foreach ($schema as $key => $kschema) { + $types = _schema::get_types($kschema, $default, $required); + + $exists = array_key_exists($key, $array); + if (!$exists) { + if ($required) { + if ($default !== null) { + $array[$key] = $default; + } else { + throw exceptions::missing_value(null, "array", "$key est obligatoire"); + } + } elseif ($default !== null) { + $array[$key] = $default; + } + continue; + } + + $vclass = _schema::get_vclass($types, $nullable); + # le test échoue si le type n'est pas supporté + if ($vclass === null) { + $ensured = false; + continue; + } + + $value = $array[$key]; + if ($nullable) { + $array[$key] = $vclass::withn($value); + } else { + if ($value === null) $value = $default; + $array[$key] = $vclass::with($value); + } + } + return $ensured; + } +} diff --git a/php/src/php/types/scalar.php b/php/src/php/types/scalar.php new file mode 100644 index 0000000..0a34b5b --- /dev/null +++ b/php/src/php/types/scalar.php @@ -0,0 +1,34 @@ + false, + ]))); + self::assertSame("7h11", strval(new Hour("30:70:80"))); + + self::assertException(ValueException::class, function() { + return strval(new Hour("bad format")); + }); + } + + function testFormat() { + self::assertSame("0h", (new Hour(0))->format()); + self::assertSame("0h56", (new Hour(56))->format()); + self::assertSame("2h", (new Hour(120))->format()); + self::assertSame("23h59", (new Hour(1439))->format()); + self::assertSame("24h", (new Hour(1440))->format()); + self::assertSame("0h01", (new Hour(1441))->format()); + } + + function testStep() { + $h = new Hour(null, [ + "step" => 5, + ]); + $h->setu(10); self::assertSame("0h10", strval($h)); + $h->setu(12); self::assertSame("0h10", strval($h)); + $h->setu(15); self::assertSame("0h15", strval($h)); + $h->setu(17); self::assertSame("0h15", strval($h)); + + $h->set("8h"); + $h->addu(); self::assertSame("8h05", strval($h)); + $h->addu(); self::assertSame("8h10", strval($h)); + $h->addu(); self::assertSame("8h15", strval($h)); + $h->subu(); self::assertSame("8h10", strval($h)); + $h->subu(); self::assertSame("8h05", strval($h)); + $h->subu(); self::assertSame("8h", strval($h)); + } +} diff --git a/php/tests/php/time/TimeTest.php b/php/tests/php/time/TimeTest.php new file mode 100644 index 0000000..998b0cb --- /dev/null +++ b/php/tests/php/time/TimeTest.php @@ -0,0 +1,74 @@ + false, + ]))); + self::assertSame("07:11:20", strval(new Time("30:70:80"))); + + self::assertException(ValueException::class, function() { + return strval(new Time("bad format")); + }); + } + + function testGetu() { + self::assertSame(0, (new Time(0))->getu()); + self::assertSame(86399, (new Time(-1))->getu()); + self::assertSame(1, (new Time(1))->getu()); + self::assertSame(120, (new Time(120))->getu()); + self::assertSame(86400, (new Time(86400))->getu()); + self::assertSame(0, (new Time(-86400))->getu()); + } + + function testAddu() { + $t = new Time(0); + $t->addu(0); self::assertSame(0, $t->getu()); + $t->addu(10); self::assertSame(10, $t->getu()); + $t->addu(10); self::assertSame(20, $t->getu()); + $t->addu(100); self::assertSame(120, $t->getu()); + $t->addu(86280); self::assertSame(86400, $t->getu()); + $t->addu(86400); self::assertSame(0, $t->getu()); + $t->addu(-86400); self::assertSame(0, $t->getu()); + } + + function testSubu() { + $t = new Time(0); + $t->subu(-86400); self::assertSame(86400, $t->getu()); + $t->subu(86400); self::assertSame(0, $t->getu()); + + $t = new Time(120); + $t->subu(100); self::assertSame(20, $t->getu()); + $t->subu(10); self::assertSame(10, $t->getu()); + $t->subu(10); self::assertSame(0, $t->getu()); + $t->subu(0); self::assertSame(0, $t->getu()); + } + + function testFormat() { + self::assertSame("00:00:00", (new Time(0))->format()); + self::assertSame("00:00:56", (new Time(56))->format()); + self::assertSame("00:02:00", (new Time(120))->format()); + self::assertSame("23:59:59", (new Time(86399))->format()); + self::assertSame("24:00:00", (new Time(86400))->format()); + self::assertSame("00:00:01", (new Time(86401))->format()); + } +} diff --git a/php/tests/php/types/assocTest.php b/php/tests/php/types/assocTest.php new file mode 100644 index 0000000..bd40a9e --- /dev/null +++ b/php/tests/php/types/assocTest.php @@ -0,0 +1,88 @@ + "string", + "int" => "int", + ], [ + "string" => 5, + "int" => "42", + ], [ + "string" => "5", + "int" => 42, + ]); + } + + const SCHEMA_S = ["s" => "string"]; + const SCHEMA_SD = ["s" => ["string", null]]; + const SCHEMA_SND = ["s" => ["string", "not null"]]; + const SCHEMA_RS = ["s" => ["string", "required" => true]]; + const SCHEMA_RSD = ["s" => ["string", null, "required" => true]]; + const SCHEMA_RSND = ["s" => ["string", "not null", "required" => true]]; + const SCHEMA_NS = ["s" => "?string"]; + const SCHEMA_NSD = ["s" => ["?string", null]]; + const SCHEMA_NSND = ["s" => ["?string", "not null"]]; + const SCHEMA_NRS = ["s" => ["?string", "required" => true]]; + const SCHEMA_NRSD = ["s" => ["?string", null, "required" => true]]; + const SCHEMA_NRSND = ["s" => ["?string", "not null", "required" => true]]; + + function testEnsureSchema2() { + self::assertEnsureOk(self::SCHEMA_S, [], []); + self::assertEnsureFail(self::SCHEMA_S, ["s" => null], ["s" => null]); + self::assertEnsureOk(self::SCHEMA_S, ["s" => "not null"], ["s" => "not null"]); + self::assertEnsureOk(self::SCHEMA_NS, [], []); + self::assertEnsureOk(self::SCHEMA_NS, ["s" => null], ["s" => null]); + self::assertEnsureOk(self::SCHEMA_NS, ["s" => "not null"], ["s" => "not null"]); + + self::assertEnsureOk(self::SCHEMA_SD, [], []); + self::assertEnsureFail(self::SCHEMA_SD, ["s" => null], ["s" => null]); + self::assertEnsureOk(self::SCHEMA_SD, ["s" => "not null"], ["s" => "not null"]); + self::assertEnsureOk(self::SCHEMA_NSD, [], []); + self::assertEnsureOk(self::SCHEMA_NSD, ["s" => null], ["s" => null]); + self::assertEnsureOk(self::SCHEMA_NSD, ["s" => "not null"], ["s" => "not null"]); + + self::assertEnsureOk(self::SCHEMA_SND, [], ["s" => "not null"]); + self::assertEnsureOk(self::SCHEMA_SND, ["s" => null], ["s" => "not null"]); + self::assertEnsureOk(self::SCHEMA_SND, ["s" => "not null"], ["s" => "not null"]); + self::assertEnsureOk(self::SCHEMA_NSND, [], ["s" => "not null"]); + self::assertEnsureOk(self::SCHEMA_NSND, ["s" => null], ["s" => null]); + self::assertEnsureOk(self::SCHEMA_NSND, ["s" => "not null"], ["s" => "not null"]); + + self::assertEnsureFail(self::SCHEMA_RS, [], []); + self::assertEnsureFail(self::SCHEMA_RS, ["s" => null], []); + self::assertEnsureOk(self::SCHEMA_RS, ["s" => "not null"], ["s" => "not null"]); + self::assertEnsureFail(self::SCHEMA_NRS, [], []); + self::assertEnsureOk(self::SCHEMA_NRS, ["s" => null], ["s" => null]); + self::assertEnsureOk(self::SCHEMA_NRS, ["s" => "not null"], ["s" => "not null"]); + + self::assertEnsureFail(self::SCHEMA_RSD, [], []); + self::assertEnsureFail(self::SCHEMA_RSD, ["s" => null], []); + self::assertEnsureOk(self::SCHEMA_RSD, ["s" => "not null"], ["s" => "not null"]); + self::assertEnsureFail(self::SCHEMA_NRSD, [], []); + self::assertEnsureOk(self::SCHEMA_NRSD, ["s" => null], ["s" => null]); + self::assertEnsureOk(self::SCHEMA_NRSD, ["s" => "not null"], ["s" => "not null"]); + + self::assertEnsureOk(self::SCHEMA_RSND, [], ["s" => "not null"]); + self::assertEnsureOk(self::SCHEMA_RSND, ["s" => null], ["s" => "not null"]); + self::assertEnsureOk(self::SCHEMA_RSND, ["s" => "not null"], ["s" => "not null"]); + self::assertEnsureOk(self::SCHEMA_NRSND, [], ["s" => "not null"]); + self::assertEnsureOk(self::SCHEMA_NRSND, ["s" => null], ["s" => null]); + self::assertEnsureOk(self::SCHEMA_NRSND, ["s" => "not null"], ["s" => "not null"]); + } +} diff --git a/php/tests/php/types/scalarTest.php b/php/tests/php/types/scalarTest.php new file mode 100644 index 0000000..44bd667 --- /dev/null +++ b/php/tests/php/types/scalarTest.php @@ -0,0 +1,60 @@ +