From 01ed9758d59cce6e5c794b11b8e9619a5f32e0c6 Mon Sep 17 00:00:00 2001
From: Jephte Clain <Jephte.Clain@univ-reunion.fr>
Date: Fri, 22 Mar 2024 13:19:28 +0400
Subject: [PATCH] modifs.mineures sans commentaires

---
 php/src_base/DataException.php        | 19 +++++++++++++++++++
 php/src_php/iter/AbstractIterator.php | 10 +++++-----
 2 files changed, 24 insertions(+), 5 deletions(-)
 create mode 100644 php/src_base/DataException.php

diff --git a/php/src_base/DataException.php b/php/src_base/DataException.php
new file mode 100644
index 0000000..b68b8ed
--- /dev/null
+++ b/php/src_base/DataException.php
@@ -0,0 +1,19 @@
+<?php
+namespace nulib;
+
+use RuntimeException;
+
+/**
+ * Class DataException: exception générique concernant l'accès à des données
+ */
+class DataException extends RuntimeException {
+  static final function no_more_data(): self {
+    return new self("no more data");
+  }
+
+  static final function ensure_not_eof($data, bool $throw=true, $eof=false) {
+    if (!$throw) return null;
+    elseif ($data !== $eof) return $data;
+    else throw self::no_more_data();
+  }
+}
diff --git a/php/src_php/iter/AbstractIterator.php b/php/src_php/iter/AbstractIterator.php
index 01ecac3..9da33e5 100644
--- a/php/src_php/iter/AbstractIterator.php
+++ b/php/src_php/iter/AbstractIterator.php
@@ -3,7 +3,7 @@ namespace nulib\php\iter;
 
 use Exception;
 use Iterator;
-use nulib\os\EOFException;
+use nulib\DataException;
 use nulib\php\ICloseable;
 
 /**
@@ -29,12 +29,12 @@ abstract class AbstractIterator implements Iterator, ICloseable {
   protected function beforeIter() {}
 
   /**
-   * retourner le prochain élément. lancer l'exception {@link EOFException} pour
-   * indiquer que plus aucun élément n'est disponible
+   * retourner le prochain élément. lancer l'exception {@link DataException}
+   * pour indiquer que plus aucun élément n'est disponible
    *
    * le cas échéant, initialiser $key
    *
-   * @throws EOFException
+   * @throws DataException
    */
   abstract protected function _next(&$key);
 
@@ -94,7 +94,7 @@ abstract class AbstractIterator implements Iterator, ICloseable {
     $this->valid = false;
     try {
       $item = $this->_next($key);
-    } catch (EOFException $e) {
+    } catch (DataException $e) {
       $this->beforeClose();
       try {
         $this->_teardown();