Improve config

CHANGELOG.md

@@ -3,6 +3,9 @@
 ## 8.0.1 under development
 
 - Bug #224: Fix signature of `CachedContent::cache()` (@vjik)
+- Bug #226: Fix `reset` config for referenced definitions (@rustamwin)
+- Chg #226: Adjust config to make `View` and `WebView` more configurable (@rustamwin)
+- Enh #226: Add `ViewInterface::getContext()` method (@rustamwin)
 
 ## 8.0.0 February 16, 2023
 

config/di-web.php

@@ -2,7 +2,9 @@
 
 declare(strict_types=1);
 
+use Psr\Container\ContainerInterface;
 use Yiisoft\Aliases\Aliases;
+use Yiisoft\Definitions\Contract\ReferenceInterface;
 use Yiisoft\Definitions\DynamicReference;
 use Yiisoft\View\Theme;
 use Yiisoft\View\WebView;
@@ -30,13 +32,19 @@
                 static fn (Aliases $aliases) => $aliases->get($params['yiisoft/view']['basePath'])
             ),
         ],
-        'setParameters()' => [
-            $params['yiisoft/view']['parameters'],
-        ],
-        'reset' => function () use ($params) {
+        'setParameters()' => ['parameters' => $params['yiisoft/view']['parameters']],
+        'withRenderers()' => ['renderers' => $params['yiisoft/view']['renderers']],
+        'withDefaultExtension()' => [$params['yiisoft/view']['defaultExtension']],
+        'reset' => function (ContainerInterface $container) use ($params) {
             /** @var WebView $this */
             $this->clear();
-            $this->setParameters($params['yiisoft/view']['parameters']);
+            $parameters = $params['yiisoft/view']['parameters'];
+            foreach ($parameters as $name => $parameter) {
+                $parameters[$name] = $parameter instanceof ReferenceInterface ?
+                    $parameter->resolve($container) :
+                    $parameter;
+            }
+            $this->setParameters($parameters);
         },
     ],
 ];

config/di.php

@@ -2,7 +2,9 @@
 
 declare(strict_types=1);
 
+use Psr\Container\ContainerInterface;
 use Yiisoft\Aliases\Aliases;
+use Yiisoft\Definitions\Contract\ReferenceInterface;
 use Yiisoft\Definitions\DynamicReference;
 use Yiisoft\View\View;
 
@@ -15,13 +17,19 @@
                 static fn (Aliases $aliases) => $aliases->get($params['yiisoft/view']['basePath'])
             ),
         ],
-        'setParameters()' => [
-            $params['yiisoft/view']['parameters'],
-        ],
-        'reset' => function () use ($params) {
+        'setParameters()' => ['parameters' => $params['yiisoft/view']['parameters']],
+        'withRenderers()' => ['renderers' => $params['yiisoft/view']['renderers']],
+        'withDefaultExtension()' => [$params['yiisoft/view']['defaultExtension']],
+        'reset' => function (ContainerInterface $container) use ($params) {
             /** @var View $this */
             $this->clear();
-            $this->setParameters($params['yiisoft/view']['parameters']);
+            $parameters = $params['yiisoft/view']['parameters'];
+            foreach ($parameters as $name => $parameter) {
+                $parameters[$name] = $parameter instanceof ReferenceInterface ?
+                    $parameter->resolve($container) :
+                    $parameter;
+            }
+            $this->setParameters($parameters);
         },
     ],
 ];

config/params.php

@@ -11,5 +11,7 @@
             'basePath' => '',
             'baseUrl' => '',
         ],
+        'renderers' => [],
+        'defaultExtension' => 'php',
     ],
 ];

src/ViewInterface.php

@@ -100,6 +100,13 @@ public function withLocale(string $locale): static;
      */
     public function getBasePath(): string;
 
+    /**
+     * Gets the context instance, or `null` if no context has been set.
+     *
+     * @return ViewContextInterface|null The context instance, or `null` if no context has been set.
+     */
+    public function getContext(): ?ViewContextInterface;
+
     /**
      * Gets the default view file extension.
      *

src/ViewTrait.php

@@ -75,7 +75,7 @@ public function withBasePath(string $basePath): static
      * corresponding supported file extensions.
      *
      * ```php
-     * $view = $view->withRenderers(['twig' => new \Yiisoft\Yii\Twig\ViewRenderer($environment)]);
+     * $view = $view->withRenderers(['twig' => new \Yiisoft\View\Twig\TemplateRenderer($environment)]);
      * ```
      *
      * If no renderer is available for the given view file, the view file will be treated as a normal PHP
@@ -184,6 +184,14 @@ public function getBasePath(): string
         return $this->basePath;
     }
 
+    /**
+     * Gets the context instance, or `null` if no context has been set.
+     */
+    public function getContext(): ?ViewContextInterface
+    {
+        return $this->context;
+    }
+
     /**
      * Gets the default view file extension.
      *

tests/ViewTest.php

@@ -197,6 +197,15 @@ public function testRenderWithoutFileExtension(): void
             ->render('file'));
     }
 
+    public function testContext(): void
+    {
+        $view = $this->createViewWithBasePath($this->tempDirectory);
+        $context = $this->createContext($this->tempDirectory);
+        $view = $view->withContext($context);
+
+        $this->assertSame($context, $view->getContext());
+    }
+
     public function testLocalize(): void
     {
         $view = $this->createViewWithBasePath($this->tempDirectory);