fix. Parser use tempData

Author: nyufeng

system/View/Parser.php

@@ -93,11 +93,11 @@ class Parser extends View
 	/**
 	 * Constructor
 	 *
-	 * @param \Config\View $config
-	 * @param string       $viewPath
-	 * @param mixed        $loader
-	 * @param boolean      $debug
-	 * @param LoggerInterface	$logger
+	 * @param \Config\View    $config
+	 * @param string          $viewPath
+	 * @param mixed           $loader
+	 * @param boolean         $debug
+	 * @param LoggerInterface $logger
 	 */
 	public function __construct($config, string $viewPath = null, $loader = null, bool $debug = null, LoggerInterface $logger = null)
 	{
@@ -157,20 +157,25 @@ public function render(string $view, array $options = null, bool $saveData = nul
 			throw ViewException::forInvalidFile($file);
 		}
 
+		if (is_null($this->tempData))
+		{
+			$this->tempData = $this->data;
+		}
+
 		$template = file_get_contents($file);
-		$output   = $this->parse($template, $this->data, $options);
+		$output   = $this->parse($template, $this->tempData, $options);
 		$this->logPerformance($start, microtime(true), $view);
 
-		if (! $saveData)
+		if ($saveData)
 		{
-			$this->data = [];
+			$this->data = $this->tempData;
 		}
 		// Should we cache?
 		if (isset($options['cache']))
 		{
 			cache()->save($cacheName, $output, (int) $options['cache']);
 		}
-
+		$this->tempData = null;
 		return $output;
 	}
 
@@ -196,14 +201,22 @@ public function renderString(string $template, array $options = null, bool $save
 			$saveData = $this->config->saveData;
 		}
 
-		$output = $this->parse($template, $this->data, $options);
+		if (is_null($this->tempData))
+		{
+			$this->tempData = $this->data;
+		}
+
+		$output = $this->parse($template, $this->tempData, $options);
 
 		$this->logPerformance($start, microtime(true), $this->excerpt($template));
 
-		if (! $saveData)
+		if ($saveData)
 		{
-			$this->data = [];
+			$this->data = $this->tempData;
 		}
+
+		$this->tempData = null;
+
 		return $output;
 	}
 
@@ -243,7 +256,8 @@ public function setData(array $data = [], string $context = null): RendererInter
 			}
 		}
 
-		$this->data = array_merge($this->data, $data);
+		$this->tempData = $this->tempData ?? $this->data;
+		$this->tempData = array_merge($this->tempData, $data);
 
 		return $this;
 	}
@@ -532,7 +546,14 @@ protected function parseConditionals(string $template): string
 
 		// Parse the PHP itself, or insert an error so they can debug
 		ob_start();
-		extract($this->data);
+
+		if (is_null($this->tempData))
+		{
+			$this->tempData = $this->data;
+		}
+
+		extract($this->tempData);
+
 		try
 		{
 			eval('?>' . $template . '<?php ');
@@ -542,6 +563,7 @@ protected function parseConditionals(string $template): string
 			ob_end_clean();
 			throw ViewException::forTagSyntaxError(str_replace(['?>', '<?php '], '', $template));
 		}
+
 		return ob_get_clean();
 	}
 

system/View/View.php

@@ -194,7 +194,7 @@ public function render(string $view, array $options = null, bool $saveData = nul
 		// Store the results here so even if
 		// multiple views are called in a view, it won't
 		// clean it unless we mean it to.
-		if ($saveData === null)
+		if (is_null($saveData))
 		{
 			$saveData = $this->saveData;
 		}
@@ -230,7 +230,7 @@ public function render(string $view, array $options = null, bool $saveData = nul
 
 		// Make our view data available to the view.
 
-		if(is_null($this->tempData))
+		if (is_null($this->tempData))
 		{
 			$this->tempData = $this->data;
 		}
@@ -286,7 +286,9 @@ public function render(string $view, array $options = null, bool $saveData = nul
 		{
 			cache()->save($this->renderVars['cacheName'], $output, (int) $this->renderVars['options']['cache']);
 		}
+
 		$this->tempData = null;
+
 		return $output;
 	}
 
@@ -316,7 +318,7 @@ public function renderString(string $view, array $options = null, bool $saveData
 			$saveData = $this->saveData;
 		}
 
-		if(is_null($this->tempData))
+		if (is_null($this->tempData))
 		{
 			$this->tempData = $this->data;
 		}
@@ -335,7 +337,9 @@ public function renderString(string $view, array $options = null, bool $saveData
 		@ob_end_clean();
 
 		$this->logPerformance($start, microtime(true), $this->excerpt($view));
+
 		$this->tempData = null;
+
 		return $output;
 	}
 
@@ -370,6 +374,7 @@ public function setData(array $data = [], string $context = null): RendererInter
 		{
 			$data = \esc($data, $context);
 		}
+
 		$this->tempData = $this->tempData ?? $this->data;
 		$this->tempData = array_merge($this->tempData, $data);
 
@@ -395,7 +400,7 @@ public function setVar(string $name, $value = null, string $context = null): Ren
 			$value = \esc($value, $context);
 		}
 
-		$this->tempData = $this->tempData ?? $this->data;
+		$this->tempData        = $this->tempData ?? $this->data;
 		$this->tempData[$name] = $value;
 
 		return $this;
@@ -424,7 +429,7 @@ public function resetData(): RendererInterface
 	 */
 	public function getData(): array
 	{
-		return $this->tempData ?? $this->data;
+		return is_null($this->tempData) ? $this->data : $this->tempData;
 	}
 
 	//--------------------------------------------------------------------

tests/_support/View/Views/simples.php

@@ -0,0 +1 @@
+<h1><?= $testString ?? 'is_not' ?></h1>

tests/system/CommonFunctionsTest.php

@@ -432,16 +432,12 @@ public function testTrace()
 
 	public function testViewNotSaveData()
 	{
-
-		$data     = [
+		$data = [
 			'testString' => 'bar',
 			'bar'        => 'baz',
 		];
-		view('\Tests\Support\View\Views\simple', $data, ['saveData' => false]);
-		ob_get_clean();
-		$this->expectException('Exception');
-		view('\Tests\Support\View\Views\simple');
-		ob_get_clean();
+		$this->assertStringContainsString('<h1>bar</h1>', view('\Tests\Support\View\Views\simples', $data, ['saveData' => false]));
+		$this->assertStringContainsString('<h1>is_not</h1>', view('\Tests\Support\View\Views\simples'));
 	}
 
 }

tests/system/View/ParserTest.php

@@ -957,10 +957,10 @@ public function testRenderStringSavingData()
 
 		$expected = '<h1>Hello World</h1>';
 		$pattern  = '<h1>{testString}</h1>';
-		$this->assertEquals($expected, $parser->renderString($pattern, [], true));
-		$this->assertArrayHasKey('testString', $parser->getData());
 		$this->assertEquals($expected, $parser->renderString($pattern, [], false));
 		$this->assertArrayNotHasKey('testString', $parser->getData());
+		$this->assertEquals($expected, $parser->renderString($pattern, [], true));
+		$this->assertArrayHasKey('testString', $parser->getData());
 	}
 
 	public function testRenderFindsOtherView()

tests/system/View/ViewTest.php

@@ -230,7 +230,7 @@ public function testCachedRender()
 
 	public function testRenderStringSavingData()
 	{
-		$view = new View($this->config, $this->viewsDir, $this->loader);
+		$view     = new View($this->config, $this->viewsDir, $this->loader);
 		$expected = '<h1>Hello World</h1>';
 
 		//I think saveData is sava current data, is not clean already set data.