modifs.mineures sans commentaires

src/ext/spreadsheet/PhpSpreadsheetBuilder.php

@@ -95,7 +95,7 @@ class PhpSpreadsheetBuilder extends AbstractBuilder {
     http::content_type($contentType);
   }
 
-  function _sendFile(): int {
+  protected function _checkOk(): bool {
     switch (path::ext($this->output)) {
     case ".ods":
       $writer = new Ods($this->ss);
@@ -105,10 +105,8 @@ class PhpSpreadsheetBuilder extends AbstractBuilder {
       $writer = new Xlsx($this->ss);
       break;
     }
-    $this->rewind();
     $writer->save($this->getResource());
     $this->rewind();
-    $this->sendHeaders();
-    return $this->fpassthru();
+    return true;
   }
 }

src/ext/spreadsheet/SpoutBuilder.php

@@ -161,10 +161,9 @@ class SpoutBuilder extends AbstractBuilder {
     http::content_type($contentType);
   }
 
-  function _sendFile(): int {
+  protected function _checkOk(): bool {
     $this->ss->close();
     $this->rewind();
-    $this->sendHeaders();
-    return $this->fpassthru();
+    return true;
   }
 }

src/file/csv/AbstractBuilder.php

@@ -125,11 +125,22 @@ abstract class AbstractBuilder extends TempStream implements IBuilder {
     $this->sentHeaders = true;
   }
 
-  abstract protected function _sendFile(): int;
-
-  function sendFile(?iterable $rows=null): int {
+  protected function _build(?iterable $rows=null): void {
     $this->writeAll($rows);
     $this->writeHeaders();
-    return $this->_sendFile();
+  }
+
+  abstract protected function _checkOk(): bool;
+
+  function build(?iterable $rows=null): bool {
+    $this->_build($rows);
+    return $this->_checkOk();
+  }
+
+  function sendFile(?iterable $rows=null): int {
+    $this->_build($rows);
+    if (!$this->_checkOk()) return 0;
+    $this->sendHeaders();
+    return $this->fpassthru();
   }
 }

src/file/csv/CsvBuilder.php

@@ -23,11 +23,10 @@ class CsvBuilder extends AbstractBuilder {
     http::content_type("text/csv");
   }
 
-  protected function _sendFile(): int {
+  protected function _checkOk(): bool {
     $size = $this->ftell();
-    if ($size === 0) return 0;
+    if ($size === 0) return false;
     $this->rewind();
-    $this->sendHeaders();
-    return $this->fpassthru();
+    return true;
   }
 }