Simplified fix thanks to @vlakoff (https://github.com/vlakoff)

8 months ago · f3453cab17
parent 276a9e69f3
commit f3453cab17
2 changed files with 22 additions and 8 deletions
--- a/flight/template/View.php
+++ b/flight/template/View.php
@ -116,19 +116,17 @@ class View
            throw new \Exception("Template file not found: {$normalized_path}.");
        }

-        if (\is_array($data)) {
-            $this->vars = \array_merge($this->vars, $data);
-        }
-
        \extract($this->vars);

-        include $this->template;
+        if (\is_array($data)) {
+            \extract($data);

-        if ($this->preserveVars === false && $data !== null) {
-            foreach (array_keys($data) as $variable) {
-                unset($this->vars[$variable]);
+            if ($this->preserveVars) {
+                $this->vars = \array_merge($this->vars, $data);
            }
        }
+
+        include $this->template;
    }

    /**
--- a/tests/ViewTest.php
+++ b/tests/ViewTest.php
@ -191,6 +191,22 @@ class ViewTest extends TestCase
        $this->view->render('input');
    }

+    public function testKeepThePreviousStateOfDataSettedBySetMethod(): void
+    {
+        $this->view->preserveVars = false;
+
+        $this->view->set('prop', 'bar');
+
+        $this->expectOutputString(<<<html
+        <div>qux</div>
+        <div>bar</div>
+
+        html);
+
+        $this->view->render('myComponent', ['prop' => 'qux']);
+        $this->view->render('myComponent');
+    }
+
    public static function renderDataProvider(): array
    {
        return [