From 80475f044c9bbd875ba4908ef9e2e78a2c8770e7 Mon Sep 17 00:00:00 2001
From: Jephte Clain <Jephte.Clain@univ-reunion.fr>
Date: Tue, 21 Oct 2025 12:26:04 +0400
Subject: [PATCH] =?UTF-8?q?r=C3=A9organiser=20les=20classes=20de=20ref?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 php/src/php/types/varray.php             |  2 +-
 php/src/ref/{schema => }/ref_analyze.php |  2 +-
 php/src/ref/{cli => }/ref_args.php       |  2 +-
 php/src/ref/{schema => }/ref_input.php   |  2 +-
 php/src/ref/{schema => }/ref_schema.php  |  2 +-
 php/src/ref/ref_types.php                | 27 ++++++++++++++++++++++++
 php/src/ref/schema/ref_types.php         | 11 ----------
 7 files changed, 32 insertions(+), 16 deletions(-)
 rename php/src/ref/{schema => }/ref_analyze.php (95%)
 rename php/src/ref/{cli => }/ref_args.php (99%)
 rename php/src/ref/{schema => }/ref_input.php (98%)
 rename php/src/ref/{schema => }/ref_schema.php (99%)
 create mode 100644 php/src/ref/ref_types.php
 delete mode 100644 php/src/ref/schema/ref_types.php

diff --git a/php/src/php/types/varray.php b/php/src/php/types/varray.php
index bc46388..3a6b416 100644
--- a/php/src/php/types/varray.php
+++ b/php/src/php/types/varray.php
@@ -9,7 +9,7 @@ class varray {
   }
 
   static function ensuren(&$array): void {
-    if ($array !== null) varray::ensure($array);
+    if ($array !== null) self::ensure($array);
   }
 
   static function with($value): array {
diff --git a/php/src/ref/schema/ref_analyze.php b/php/src/ref/ref_analyze.php
similarity index 95%
rename from php/src/ref/schema/ref_analyze.php
rename to php/src/ref/ref_analyze.php
index 060d68b..24dff0c 100644
--- a/php/src/ref/schema/ref_analyze.php
+++ b/php/src/ref/ref_analyze.php
@@ -1,5 +1,5 @@
 <?php
-namespace nulib\ref\schema;
+namespace nulib\ref;
 
 class ref_analyze {
   /** @var int résultat de l'analyse: valeur inexistante */
diff --git a/php/src/ref/cli/ref_args.php b/php/src/ref/ref_args.php
similarity index 99%
rename from php/src/ref/cli/ref_args.php
rename to php/src/ref/ref_args.php
index 962da26..75ae9f5 100644
--- a/php/src/ref/cli/ref_args.php
+++ b/php/src/ref/ref_args.php
@@ -1,5 +1,5 @@
 <?php
-namespace nulib\ref\cli;
+namespace nulib\ref;
 
 /**
  * Class ref_args: référence du format des arguments pour une application
diff --git a/php/src/ref/schema/ref_input.php b/php/src/ref/ref_input.php
similarity index 98%
rename from php/src/ref/schema/ref_input.php
rename to php/src/ref/ref_input.php
index b7b00b9..ed949c1 100644
--- a/php/src/ref/schema/ref_input.php
+++ b/php/src/ref/ref_input.php
@@ -1,5 +1,5 @@
 <?php
-namespace nulib\ref\schema;
+namespace nulib\ref;
 
 class ref_input {
   const ACCESS_AUTO = 0, ACCESS_KEY = 1, ACCESS_PROPERTY = 2;
diff --git a/php/src/ref/schema/ref_schema.php b/php/src/ref/ref_schema.php
similarity index 99%
rename from php/src/ref/schema/ref_schema.php
rename to php/src/ref/ref_schema.php
index 37bea48..b1cda6d 100644
--- a/php/src/ref/schema/ref_schema.php
+++ b/php/src/ref/ref_schema.php
@@ -1,5 +1,5 @@
 <?php
-namespace nulib\ref\schema;
+namespace nulib\ref;
 
 class ref_schema {
   /** @var array schéma des natures de schéma */
diff --git a/php/src/ref/ref_types.php b/php/src/ref/ref_types.php
new file mode 100644
index 0000000..0806000
--- /dev/null
+++ b/php/src/ref/ref_types.php
@@ -0,0 +1,27 @@
+<?php
+namespace nulib\ref;
+
+class ref_types {
+  /** types simples valides */
+  const TYPES = [
+    "rawstring", "string", "text",
+    "bool",
+    "int",
+    "float",
+    "array",
+    "func",
+    "raw",
+    "mixed",
+    "key", "pkey",
+    "content",
+    "datetime", "date", "time",
+  ];
+
+  /** aliases pour les types simples */
+  const ALIASES = [
+    "boolean" => "bool",
+    "integer" => "int",
+    "flt" => "float", "double" => "float", "dbl" => "float",
+    "function" => "func", "callable" => "func",
+  ];
+}
diff --git a/php/src/ref/schema/ref_types.php b/php/src/ref/schema/ref_types.php
deleted file mode 100644
index d7ce1d4..0000000
--- a/php/src/ref/schema/ref_types.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-namespace nulib\ref\schema;
-
-class ref_types {
-  const ALIASES = [
-    "boolean" => "bool",
-    "integer" => "int",
-    "flt" => "float", "double" => "float", "dbl" => "float",
-    "func" => "callable", "function" => "callable",
-  ];
-}