🩹 Prevent with() and override() from being triggered twice on mer…

…ge (#350)
roots · Feb 17, 2024 · 35e7ac7 · 35e7ac7
1 parent d049493
commit 35e7ac7
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/src/Roots/Acorn/View/Composer.php b/src/Roots/Acorn/View/Composer.php
@@ -90,7 +90,9 @@ public function compose(View $view)
      */
     protected function merge()
     {
-        if (! $this->with() && ! $this->override()) {
+        [$with, $override] = [$this->with(), $this->override()];
+
+        if (! $with && ! $override) {
             return array_merge(
                 $this->extractPublicProperties(),
                 $this->extractPublicMethods(),
@@ -99,9 +101,9 @@ protected function merge()
         }
 
         return array_merge(
-            $this->with(),
+            $with,
             $this->view->getData(),
-            $this->override()
+            $override
         );
     }