From fd1ebaf6114f005418de0a46c2d6631678647278 Mon Sep 17 00:00:00 2001
From: Jephte Clain <Jephte.Clain@univ-reunion.fr>
Date: Sun, 23 Mar 2025 08:19:20 +0400
Subject: [PATCH] modifs.mineures sans commentaires

---
 src/php/access/AbstractAccess.php |  9 +++++++++
 src/php/access/ChainAccess.php    | 15 +++++++++++++++
 src/php/access/IAccess.php        | 21 +++++++++++++++++++++
 src/php/access/PropertyAccess.php |  8 --------
 src/php/access/ShadowAccess.php   | 12 ++++++++++++
 5 files changed, 57 insertions(+), 8 deletions(-)

diff --git a/src/php/access/AbstractAccess.php b/src/php/access/AbstractAccess.php
index 417d2cb..cffb954 100644
--- a/src/php/access/AbstractAccess.php
+++ b/src/php/access/AbstractAccess.php
@@ -45,4 +45,13 @@ abstract class AbstractAccess implements IAccess {
     cl::set($array, $key, $value);
     $this->set($array);
   }
+
+  function ensureAssoc(array $keys, ?array $params=null): void {
+  }
+
+  function ensureKeys(array $defaults, ?array $params=null): void {
+  }
+
+  function ensureOrder(array $keys, ?array $params=null): void {
+  }
 }
diff --git a/src/php/access/ChainAccess.php b/src/php/access/ChainAccess.php
index 299c01d..00529ce 100644
--- a/src/php/access/ChainAccess.php
+++ b/src/php/access/ChainAccess.php
@@ -164,4 +164,19 @@ class ChainAccess extends AbstractAccess {
       return new ChainAccess($this, $key);
     }
   }
+
+  function ensureAssoc(array $keys, ?array $params=null): void {
+    #XXX fonction de $accessType?
+    #$this->access->ensureAssoc($keys, $params);
+  }
+
+  function ensureKeys(array $defaults, ?array $params=null): void {
+    #XXX fonction de $accessType?
+    #$this->access->ensureKeys($defaults, $params);
+  }
+
+  function ensureOrder(array $keys, ?array $params=null): void {
+    #XXX fonction de $accessType?
+    #$this->access->ensureOrder($keys, $params);
+  }
 }
diff --git a/src/php/access/IAccess.php b/src/php/access/IAccess.php
index 7987c4c..a6f9b84 100644
--- a/src/php/access/IAccess.php
+++ b/src/php/access/IAccess.php
@@ -1,6 +1,8 @@
 <?php
 namespace nur\sery\wip\php\access;
 
+use ReflectionClass;
+
 /**
  * Interface IAccess: abstraction d'un accès complet à une valeur
  */
@@ -28,4 +30,23 @@ interface IAccess extends IGetter, ISetter, IDeleter {
 
   /** retourner une instance permettant d'accéder à $value[$key] */
   function addKey($key): IAccess;
+
+  /**
+   * s'assurer que la destination est un tableau associatif en remplaçant les
+   * clés numériques par les clés correspondantes du tableau $keys
+   */
+  function ensureAssoc(array $keys, ?array $params=null): void;
+
+  /**
+   * s'assurer que toutes les clés mentionnées dans le tableau $defaults
+   * existent. si elles n'existent pas, leur donner la valeur du tableau
+   * $defaults
+   */
+  function ensureKeys(array $defaults, ?array $params=null): void;
+
+  /**
+   * s'assure que les clés de la destination sont dans l'ordre mentionné dans le
+   * tableau $keys. toutes les clés supplémentaires sont placées à la fin
+   */
+  function ensureOrder(array $keys, ?array $params=null): void;
 }
diff --git a/src/php/access/PropertyAccess.php b/src/php/access/PropertyAccess.php
index 522c9db..2461221 100644
--- a/src/php/access/PropertyAccess.php
+++ b/src/php/access/PropertyAccess.php
@@ -146,10 +146,6 @@ class PropertyAccess extends AbstractAccess {
     return new ChainAccess($this, $key);
   }
 
-  function ensureAssoc(array $keys, ?array $params=null): void {
-    # NOP
-  }
-
   function ensureKeys(array $defaults, ?array $params=null): void {
     $dest = $this->dest;
     if ($dest === null) {
@@ -176,8 +172,4 @@ class PropertyAccess extends AbstractAccess {
       }
     }
   }
-
-  function ensureOrder(array $keys, ?array $params=null): void {
-    # NOP
-  }
 }
diff --git a/src/php/access/ShadowAccess.php b/src/php/access/ShadowAccess.php
index e4f1211..bdd12d6 100644
--- a/src/php/access/ShadowAccess.php
+++ b/src/php/access/ShadowAccess.php
@@ -57,4 +57,16 @@ class ShadowAccess extends AbstractAccess {
   function addKey($key): IAccess {
     return new ChainAccess($this, $key);
   }
+
+  function ensureAssoc(array $keys, ?array $params=null): void {
+    $this->writer->ensureAssoc($keys, $params);
+  }
+
+  function ensureKeys(array $defaults, ?array $params=null): void {
+    $this->writer->ensureKeys($defaults, $params);
+  }
+
+  function ensureOrder(array $keys, ?array $params=null): void {
+    $this->writer->ensureOrder($keys, $params);
+  }
 }