From 31d67148c3565755eda468e9bc75e363a84bc6e8 Mon Sep 17 00:00:00 2001
From: Jephte Clain <Jephte.Clain@univ-reunion.fr>
Date: Tue, 23 Apr 2024 00:13:30 +0400
Subject: [PATCH] modifs.mineures sans commentaires

---
 src/schema/types/IType.php     |  3 ++-
 src/schema/types/_tsimple.php  | 14 ++++++++++++++
 src/schema/types/tarray.php    | 15 ++++++++++++++-
 src/schema/types/tbool.php     |  8 ++------
 src/schema/types/tcallable.php | 17 ++++++++++++++++-
 src/schema/types/tcontent.php  | 16 +++++++++++++++-
 src/schema/types/tfloat.php    | 12 ++----------
 src/schema/types/tint.php      | 12 ++----------
 src/schema/types/tkey.php      | 16 +++++++++++++++-
 src/schema/types/tpkey.php     | 16 +++++++++++++++-
 src/schema/types/tstring.php   | 16 ++++++----------
 11 files changed, 103 insertions(+), 42 deletions(-)
 create mode 100644 src/schema/types/_tsimple.php

diff --git a/src/schema/types/IType.php b/src/schema/types/IType.php
index eb03408..70c4fbc 100644
--- a/src/schema/types/IType.php
+++ b/src/schema/types/IType.php
@@ -21,7 +21,8 @@ interface IType {
   /**
    * analyser, corriger éventuellement et normaliser la valeur
    *
-   * si la valeur était déjà normalisée, retourner false.
+   * si la valeur était déjà normalisée, ou si une erreur s'est produite,
+   * retourner false.
    */
   function verifix(&$value, Result &$result, Schema $schema): bool;
 
diff --git a/src/schema/types/_tsimple.php b/src/schema/types/_tsimple.php
new file mode 100644
index 0000000..73c2e37
--- /dev/null
+++ b/src/schema/types/_tsimple.php
@@ -0,0 +1,14 @@
+<?php
+namespace nur\sery\schema\types;
+
+use nur\sery\schema\input\Input;
+
+abstract class _tsimple implements IType {
+  function isAvailable(Input $input, $destKey): bool {
+    return $input->isAvailable($destKey) && $input->get($destKey) !== false;
+  }
+
+  function isNull($value): bool {
+    return $value === null || (is_string($value) && trim($value) === "");
+  }
+}
diff --git a/src/schema/types/tarray.php b/src/schema/types/tarray.php
index f06061a..76ad9f3 100644
--- a/src/schema/types/tarray.php
+++ b/src/schema/types/tarray.php
@@ -2,8 +2,10 @@
 namespace nur\sery\schema\types;
 
 use nur\sery\cl;
+use nur\sery\schema\Result;
+use nur\sery\schema\Schema;
 
-abstract class tarray implements IType {
+class tarray extends _tsimple {
   static function ensure_array(&$array): void {
     if (!is_array($array)) $array = cl::with($array);
   }
@@ -11,4 +13,15 @@ abstract class tarray implements IType {
   static function ensure_narray(&$array): void {
     if ($array !== null) self::ensure_array($array);
   }
+
+  function isValid($value, ?bool &$normalized=null): bool {
+    $normalized = is_array($value);
+    return is_scalar($value) || is_array($value);
+  }
+
+  function verifix(&$value, Result &$result, Schema $schema): bool {
+  }
+
+  function format($value, $format=null): string {
+  }
 }
diff --git a/src/schema/types/tbool.php b/src/schema/types/tbool.php
index 08ad7ba..4461aa9 100644
--- a/src/schema/types/tbool.php
+++ b/src/schema/types/tbool.php
@@ -9,7 +9,7 @@ use nur\sery\schema\input\Input;
 use nur\sery\schema\Result;
 use nur\sery\schema\Schema;
 
-class tbool implements IType {
+class tbool extends _tsimple {
   /** liste de valeurs chaines à considérer comme 'OUI' */
   const YES_VALUES = [
     # IMPORTANT: ordonner par taille décroissante pour compatibilité avec parse()
@@ -57,18 +57,14 @@ class tbool implements IType {
     return $input->isAvailable($destKey);
   }
 
-  function isNull($value): bool {
-    return $value === null || (is_string($value) && trim($value) === "");
-  }
-
   function isValid($value, ?bool &$normalized=null): bool {
+    $normalized = is_bool($value);
     if (is_string($value)) {
       $value = trim($value);
       $valid = self::is_yes($value) || self::is_no($value);
     } else {
       $valid = is_scalar($value);
     }
-    $normalized = is_bool($value);
     return $valid;
   }
 
diff --git a/src/schema/types/tcallable.php b/src/schema/types/tcallable.php
index 3bcb4d1..ed84642 100644
--- a/src/schema/types/tcallable.php
+++ b/src/schema/types/tcallable.php
@@ -1,9 +1,13 @@
 <?php
 namespace nur\sery\schema\types;
 
+use nur\sery\php\func;
+use nur\sery\schema\Result;
+use nur\sery\schema\Schema;
 use nur\sery\ValueException;
+use stdClass;
 
-abstract class tcallable implements IType {
+class tcallable extends _tsimple {
   static function ensure_callable(&$callable): void {
     if (!is_callable($callable)) throw ValueException::invalid_type($callable, "callable");
   }
@@ -11,4 +15,15 @@ abstract class tcallable implements IType {
   static function ensure_ncallable(&$callable): void {
     if ($callable !== null) self::ensure_callable($callable);
   }
+
+  function isValid($value, ?bool &$normalized=null): bool {
+    $normalized = is_callable($value);
+    return func::check_func($value, stdClass::class);
+  }
+
+  function verifix(&$value, Result &$result, Schema $schema): bool {
+  }
+
+  function format($value, $format=null): string {
+  }
 }
diff --git a/src/schema/types/tcontent.php b/src/schema/types/tcontent.php
index 1135e8e..350fd1a 100644
--- a/src/schema/types/tcontent.php
+++ b/src/schema/types/tcontent.php
@@ -1,7 +1,10 @@
 <?php
 namespace nur\sery\schema\types;
 
-abstract class tcontent implements IType {
+use nur\sery\schema\Result;
+use nur\sery\schema\Schema;
+
+abstract class tcontent extends _tsimple {
   static function ensure_content(&$content): void {
     if (!is_string($content) && !is_array($content)) $content = strval($content);
   }
@@ -9,4 +12,15 @@ abstract class tcontent implements IType {
   static function ensure_ncontent(&$content): void {
     if ($content !== null) self::ensure_content($content);
   }
+
+  function isValid($value, ?bool &$normalized=null): bool {
+    $normalized = is_string($value) || is_array($value);
+    return is_scalar($value) || is_array($value);
+  }
+
+  function verifix(&$value, Result &$result, Schema $schema): bool {
+  }
+
+  function format($value, $format=null): string {
+  }
 }
diff --git a/src/schema/types/tfloat.php b/src/schema/types/tfloat.php
index 3b5c539..165ca41 100644
--- a/src/schema/types/tfloat.php
+++ b/src/schema/types/tfloat.php
@@ -7,7 +7,7 @@ use nur\sery\schema\input\Input;
 use nur\sery\schema\Result;
 use nur\sery\schema\Schema;
 
-class tfloat implements IType {
+class tfloat extends _tsimple {
   static function ensure_float(&$float): void {
     if (!is_float($float)) $float = floatval($float);
   }
@@ -16,18 +16,10 @@ class tfloat implements IType {
     if ($float !== null) self::ensure_float($float);
   }
 
-  function isAvailable(Input $input, $destKey): bool {
-    return $input->isAvailable($destKey) && $input->get($destKey) !== false;
-  }
-
-  function isNull($value): bool {
-    return $value === null || (is_string($value) && trim($value) === "");
-  }
-
   function isValid($value, ?bool &$normalized=null): bool {
+    $normalized = is_float($value);
     if (is_string($value)) $valid = is_numeric(trim($value));
     else $valid = is_scalar($value);
-    $normalized = is_float($value);
     return $valid;
   }
 
diff --git a/src/schema/types/tint.php b/src/schema/types/tint.php
index a5c52cd..8fc6746 100644
--- a/src/schema/types/tint.php
+++ b/src/schema/types/tint.php
@@ -7,7 +7,7 @@ use nur\sery\schema\input\Input;
 use nur\sery\schema\Result;
 use nur\sery\schema\Schema;
 
-class tint implements IType {
+class tint extends _tsimple {
   static function ensure_int(&$int): void {
     if (!is_int($int)) $int = intval($int);
   }
@@ -16,20 +16,12 @@ class tint implements IType {
     if ($int !== null) self::ensure_int($int);
   }
 
-  function isAvailable(Input $input, $destKey): bool {
-    return $input->isAvailable($destKey) && $input->get($destKey) !== false;
-  }
-
-  function isNull($value): bool {
-    return $value === null || (is_string($value) && trim($value) === "");
-  }
-
   const INT_PATTERN = '/^[-+]?[0-9]+(?:\.[0-9]*)?$/';
 
   function isValid($value, ?bool &$normalized=null): bool {
+    $normalized = is_int($value);
     if (is_string($value)) $valid = is_numeric(trim($value));
     else $valid = is_scalar($value);
-    $normalized = is_int($value);
     return $valid;
   }
 
diff --git a/src/schema/types/tkey.php b/src/schema/types/tkey.php
index 731beb2..69b517e 100644
--- a/src/schema/types/tkey.php
+++ b/src/schema/types/tkey.php
@@ -1,7 +1,10 @@
 <?php
 namespace nur\sery\schema\types;
 
-abstract class tkey implements IType {
+use nur\sery\schema\Result;
+use nur\sery\schema\Schema;
+
+class tkey extends _tsimple {
   static function ensure_key(&$key): void {
     if (!is_string($key) && !is_int($key)) $key = strval($key);
   }
@@ -9,4 +12,15 @@ abstract class tkey implements IType {
   static function ensure_nkey(&$key): void {
     if ($key !== null) self::ensure_key($key);
   }
+
+  function isValid($value, ?bool &$normalized=null): bool {
+    $normalized = is_string($value) || is_int($value);
+    return is_scalar($value);
+  }
+
+  function verifix(&$value, Result &$result, Schema $schema): bool {
+  }
+
+  function format($value, $format=null): string {
+  }
 }
diff --git a/src/schema/types/tpkey.php b/src/schema/types/tpkey.php
index 4039691..2a73469 100644
--- a/src/schema/types/tpkey.php
+++ b/src/schema/types/tpkey.php
@@ -1,7 +1,10 @@
 <?php
 namespace nur\sery\schema\types;
 
-abstract class tpkey implements IType {
+use nur\sery\schema\Result;
+use nur\sery\schema\Schema;
+
+class tpkey extends _tsimple {
   static function ensure_pkey(&$pkey): void {
     if (!is_string($pkey) && !is_int($pkey) && !is_array($pkey)) $pkey = strval($pkey);
     if (is_array($pkey)) {
@@ -15,4 +18,15 @@ abstract class tpkey implements IType {
   static function ensure_npkey(&$pkey): void {
     if ($pkey !== null) self::ensure_pkey($pkey);
   }
+
+  function isValid($value, ?bool &$normalized=null): bool {
+    $normalized = is_string($value) || is_int($value) || is_array($value);
+    return is_scalar($value) || is_array($value);
+  }
+
+  function verifix(&$value, Result &$result, Schema $schema): bool {
+  }
+
+  function format($value, $format=null): string {
+  }
 }
diff --git a/src/schema/types/tstring.php b/src/schema/types/tstring.php
index e36203f..f552a04 100644
--- a/src/schema/types/tstring.php
+++ b/src/schema/types/tstring.php
@@ -7,7 +7,7 @@ use nur\sery\schema\input\Input;
 use nur\sery\schema\Result;
 use nur\sery\schema\Schema;
 
-class tstring implements IType {
+class tstring extends _tsimple {
   static function ensure_string(&$string): void {
     if (!is_string($string)) $string = strval($string);
   }
@@ -16,18 +16,13 @@ class tstring implements IType {
     if ($string !== null) self::ensure_string($string);
   }
 
-  function isAvailable(Input $input, $destKey): bool {
-    return $input->isAvailable($destKey) && $input->get($destKey) !== false;
-  }
-
   function isNull($value): bool {
     return $value === null;
   }
 
   function isValid($value, ?bool &$normalized=null): bool {
-    $valid = is_scalar($value);
     $normalized = is_string($value);
-    return $valid;
+    return is_scalar($value);
   }
   
   /**
@@ -40,11 +35,12 @@ class tstring implements IType {
       return false;
     } elseif (is_scalar($value)) {
       $value = strval($value);
+      $result->setValid();
+      return true;
     } else {
-      return $result->setInvalid($value, $schema);
+      $result->setInvalid($value, $schema);
+      return false;
     }
-    $result->setValid();
-    return true;
   }
 
   function format($value, $format=null): string {