diff --git a/src/Roots/Acorn/View/Composer.php b/src/Roots/Acorn/View/Composer.php index c51c91d1..1a8abfac 100644 --- 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 ); }