From 3ad8a8b6b0a9cd9ba22bf019d3c64350b1f9b85a Mon Sep 17 00:00:00 2001
From: Jephte Clain <Jephte.Clain@univ-reunion.fr>
Date: Fri, 12 Sep 2025 19:08:56 +0400
Subject: [PATCH] modifs.mineures sans commentaires

---
 src/php/{coll => iter}/Cursor.php |  2 +-
 src/php/iter/Filter.php           | 26 ++++++++++++++++++++++++++
 src/php/iter/IFilter.php          |  6 ++++++
 src/php/iter/IFiltrable.php       | 11 +++++++++++
 src/php/iter/NullFilter.php       | 14 ++++++++++++++
 src/php/iter/TFiltrable.php       | 15 +++++++++++++++
 src/php/iter/TODO.md              | 18 ++++++++++++++++++
 7 files changed, 91 insertions(+), 1 deletion(-)
 rename src/php/{coll => iter}/Cursor.php (99%)
 create mode 100644 src/php/iter/Filter.php
 create mode 100644 src/php/iter/IFilter.php
 create mode 100644 src/php/iter/IFiltrable.php
 create mode 100644 src/php/iter/NullFilter.php
 create mode 100644 src/php/iter/TFiltrable.php
 create mode 100644 src/php/iter/TODO.md

diff --git a/src/php/coll/Cursor.php b/src/php/iter/Cursor.php
similarity index 99%
rename from src/php/coll/Cursor.php
rename to src/php/iter/Cursor.php
index bc5c9a3..1579c1f 100644
--- a/src/php/coll/Cursor.php
+++ b/src/php/iter/Cursor.php
@@ -1,5 +1,5 @@
 <?php
-namespace nulib\php\coll;
+namespace nulib\php\iter;
 
 use ArrayAccess;
 use Iterator;
diff --git a/src/php/iter/Filter.php b/src/php/iter/Filter.php
new file mode 100644
index 0000000..0be8f88
--- /dev/null
+++ b/src/php/iter/Filter.php
@@ -0,0 +1,26 @@
+<?php
+namespace nulib\php\iter;
+
+use nulib\ValueException;
+
+class Filter implements IFilter {
+  static function with($filter): IFilter {
+    if ($filter instanceof IFilter) return $filter;
+    elseif (is_array($filter)) return new static($filter);
+    elseif ($filter === null) return NullFilter::get();
+    else throw ValueException::invalid_type($filter, IFilter::class);
+  }
+
+  function __construct(?array $filter) {
+    $this->filter = $filter;
+  }
+
+  protected ?array $filter;
+
+  function matchValue($value): bool {
+    $filter = $this->filter;
+    if ($filter === null) return true;
+    #XXX implémenter le filtre
+    return false;
+  }
+}
diff --git a/src/php/iter/IFilter.php b/src/php/iter/IFilter.php
new file mode 100644
index 0000000..e80f723
--- /dev/null
+++ b/src/php/iter/IFilter.php
@@ -0,0 +1,6 @@
+<?php
+namespace nulib\php\iter;
+
+interface IFilter {
+  function matchValue($value): bool;
+}
diff --git a/src/php/iter/IFiltrable.php b/src/php/iter/IFiltrable.php
new file mode 100644
index 0000000..f7da746
--- /dev/null
+++ b/src/php/iter/IFiltrable.php
@@ -0,0 +1,11 @@
+<?php
+namespace nulib\php\iter;
+
+use Traversable;
+
+/**
+ * Class IFiltrable: un itérateur filtrable
+ */
+interface IFiltrable {
+  function applyFilter($filter): Traversable;
+}
diff --git a/src/php/iter/NullFilter.php b/src/php/iter/NullFilter.php
new file mode 100644
index 0000000..f4319b4
--- /dev/null
+++ b/src/php/iter/NullFilter.php
@@ -0,0 +1,14 @@
+<?php
+namespace nulib\php\iter;
+
+class NullFilter implements IFilter {
+  private static $instance;
+
+  static final function get(): self {
+    return self::$instance ??= new self();
+  }
+
+  function matchValue($value): bool {
+    return true;
+  }
+}
diff --git a/src/php/iter/TFiltrable.php b/src/php/iter/TFiltrable.php
new file mode 100644
index 0000000..9efd17e
--- /dev/null
+++ b/src/php/iter/TFiltrable.php
@@ -0,0 +1,15 @@
+<?php
+namespace nulib\php\iter;
+
+use Generator;
+
+trait TFiltrable {
+  function applyFilter($filter): Generator {
+    $filter = Filter::with($filter);
+    foreach ($this as $value) {
+      if ($filter->matchValue($value)) {
+        yield $value;
+      }
+    }
+  }
+}
diff --git a/src/php/iter/TODO.md b/src/php/iter/TODO.md
new file mode 100644
index 0000000..83e681a
--- /dev/null
+++ b/src/php/iter/TODO.md
@@ -0,0 +1,18 @@
+# php\iter
+
+Interface IFiltrable, permettant de filtrer un iterator
+* les implémenteurs seraient
+  * Cursor pour filtrer les données
+  * Database pour filtrer le contenu d'une table
+
+l'idée était que l'on puisse manipuler une source de données (provenant d'un
+cursor ou d'une table) et que le filtrage serait géré à part
+--> il semble que c'est de l'over-engineering... l'idée est abandonnée pour le moment
+
+garder cependant l'idée d'un filtre utilisant la même syntaxe que le filtre pour
+Database
+
+---
+
+
+-*- coding: utf-8 mode: markdown -*- vim:sw=4:sts=4:et:ai:si:sta:fenc=utf-8:noeol:binary
\ No newline at end of file