From 69caadfb15cebc39b828f78eee25814814d8ad3b Mon Sep 17 00:00:00 2001 From: Jephte Clain Date: Tue, 29 Apr 2025 10:58:32 +0400 Subject: [PATCH] utiliser nur_func --- src/ext/spout/SpoutBuilder.php | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/ext/spout/SpoutBuilder.php b/src/ext/spout/SpoutBuilder.php index 22d1cf9..83ba5e1 100644 --- a/src/ext/spout/SpoutBuilder.php +++ b/src/ext/spout/SpoutBuilder.php @@ -6,7 +6,6 @@ use nulib\file\tab\AbstractBuilder; use nulib\file\tab\TAbstractBuilder; use nulib\os\path; use nulib\php\func; -use nulib\php\nur_func; use nulib\php\time\Date; use nulib\php\time\DateTime; use nulib\ref\ext\spout\ref_builder; @@ -121,7 +120,7 @@ class SpoutBuilder extends AbstractBuilder { $right = $borderDef["right"] ?? null; $bottom = $borderDef["bottom"] ?? null; $left = $borderDef["left"] ?? null; - + self::add_border_part($border, "top", $top); self::add_border_part($border, "right", $right); self::add_border_part($border, "bottom", $bottom); @@ -324,13 +323,8 @@ class SpoutBuilder extends AbstractBuilder { } if (array_key_exists("cook_func", $sheetParams)) { $cookFunc = $sheetParams["cook_func"] ?? null; - $cookCtx = $cookArgs = null; - if ($cookFunc !== null) { - nur_func::ensure_func($cookFunc, $this, $cookArgs); - $cookCtx = nur_func::_prepare($cookFunc); - } - $this->cookCtx = $cookCtx; - $this->cookArgs = $cookArgs; + if ($cookFunc !== null) $cookFunc = func::with($cookFunc)->bind($this); + $this->cookFunc = $cookFunc; } } return $this;