Fix theme clearing in withClearedState() (#279)

vjik · samdark · web-flow · commit 00a1dbf369dc · 2024-12-20T16:01:11.000+03:00
Co-authored-by: Alexander Makarov &lt;sam@rmcreative.ru&gt;
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,7 @@
 ## 11.0.1 October 08, 2024
 
 - Enh #275: Make `psr/event-dispatcher` dependency optional (@vjik)
+- Bug #279: Fix clearing theme in `View::withClearedState()` and `WebView::withClearedState()` (@vjik) 
 
 ## 11.0.0 October 02, 2024
 
diff --git a/src/View.php b/src/View.php
@@ -54,6 +54,7 @@ public function withClearedState(): static
         $new = clone $this;
         $new->state = new ViewState();
         $new->localeState = new LocaleState();
+        $new->themeState = new ThemeState();
         return $new;
     }
 
diff --git a/src/WebView.php b/src/WebView.php
@@ -108,6 +108,7 @@ public function withClearedState(): static
         $new = clone $this;
         $new->state = new WebViewState();
         $new->localeState = new LocaleState();
+        $new->themeState = new ThemeState();
         return $new;
     }
 
diff --git a/tests/ViewTest.php b/tests/ViewTest.php
@@ -538,15 +538,17 @@ public function testClear(): void
 
     public function testWithClearedState(): void
     {
-        $view = TestHelper::createView();
+        $view = new View();
         $view->setBlock('name', 'Mike');
         $view->setParameter('age', 42);
+        $view->setTheme(new Theme());
 
         $newView = $view->withClearedState();
 
         $this->assertNull($newView->getViewFile());
         $this->assertFalse($newView->hasBlock('name'));
         $this->assertFalse($newView->hasParameter('age'));
+        $this->assertNull($newView->getTheme());
     }
 
     public function testCommonStateForClonedViews(): void
diff --git a/tests/WebViewTest.php b/tests/WebViewTest.php
@@ -25,6 +25,7 @@
 use Yiisoft\View\Event\WebView\PageEnd;
 use Yiisoft\View\Tests\TestSupport\TestHelper;
 use Yiisoft\View\Tests\TestSupport\TestTrait;
+use Yiisoft\View\Theme;
 use Yiisoft\View\WebView;
 
 final class WebViewTest extends TestCase
@@ -966,13 +967,15 @@ public function testWithClearedState(): void
         $webView->registerCssFile('./main.css');
         $webView->registerJs('alert(42);');
         $webView->registerJsFile('./main.js');
+        $webView->setTheme(new Theme());
 
         $newWebView = $webView->withClearedState();
 
         $this->assertNull($newWebView->getViewFile());
         $this->assertFalse($newWebView->hasBlock('name'));
         $this->assertFalse($newWebView->hasParameter('age'));
         $this->assertSame('', $newWebView->getTitle());
+        $this->assertNull($newWebView->getTheme());
 
         $this->assertSame(
             '[BEGINPAGE][/BEGINPAGE]' . "\n" .

Original file line number	Diff line number	Diff line change
`@@ -54,6 +54,7 @@ public function withClearedState(): static`
`54`	`54`	`$new = clone $this;`
`55`	`55`	`$new->state = new ViewState();`
`56`	`56`	`$new->localeState = new LocaleState();`
	`57`	`+ $new->themeState = new ThemeState();`
`57`	`58`	`return $new;`
`58`	`59`	`}`
`59`	`60`
Original file line number	Diff line number	Diff line change
`@@ -108,6 +108,7 @@ public function withClearedState(): static`
`108`	`108`	`$new = clone $this;`
`109`	`109`	`$new->state = new WebViewState();`
`110`	`110`	`$new->localeState = new LocaleState();`
	`111`	`+ $new->themeState = new ThemeState();`
`111`	`112`	`return $new;`
`112`	`113`	`}`
`113`	`114`