merge #14: allow overriding fluent functions

jrmajor · Jul 8, 2023 · 0dbb570 · 0dbb570
2 parents d316bd9 + 6d216b7
commit 0dbb570
Showing 1 changed file with 10 additions and 10 deletions.
diff --git a/src/Bundle/FluentBundle.php b/src/Bundle/FluentBundle.php
@@ -37,18 +37,16 @@ public function __construct(
         private bool $allowOverrides = false,
     ) {
         $this->functions = [
-            'NUMBER' => Closure::fromCallable([$this, 'numberFunction']),
-            'DATETIME' => Closure::fromCallable([$this, 'dateTimeFunction']),
+            'NUMBER' => $this->numberFunction(...),
+            'DATETIME' => $this->dateTimeFunction(...),
         ];
     }
 
     /**
      * @return $this
      */
-    public function addResource(
-        FluentResource $resource,
-        ?bool $allowOverrides = null,
-    ): static {
+    public function addResource(FluentResource $resource, ?bool $allowOverrides = null): static
+    {
         $allowOverrides ??= $this->allowOverrides;
 
         foreach ($resource->body as $entry) {
@@ -87,9 +85,11 @@ public function addFtl(string $ftl, ?bool $allowOverrides = null): static
     /**
      * @return $this
      */
-    public function addFunction(string $name, Closure $function): static
+    public function addFunction(string $name, Closure $function, ?bool $allowOverrides = null): static
     {
-        if ($this->hasFunction($name)) {
+        $allowOverrides ??= $this->allowOverrides;
+
+        if (! $allowOverrides && $this->hasFunction($name)) {
             throw new FunctionExistsException($name);
         }
 
@@ -103,10 +103,10 @@ public function addFunction(string $name, Closure $function): static
      *
      * @return $this
      */
-    public function addFunctions(array $functions): static
+    public function addFunctions(array $functions, ?bool $allowOverrides = null): static
     {
         foreach ($functions as $name => $function) {
-            $this->addFunction($name, $function);
+            $this->addFunction($name, $function, $allowOverrides);
         }
 
         return $this;