Allow the use of aliases with the viewPath property. (#23)

yiisoft · Dec 30, 2020 · 8154416 · 8154416
1 parent aa9a993
commit 8154416
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/composer.json b/composer.json
@@ -29,8 +29,8 @@
     },
     "require-dev": {
         "nyholm/psr7": "^1.3",
-        "phpunit/phpunit": "^9.4",
-        "roave/infection-static-analysis-plugin": "^1.5",
+        "phpunit/phpunit": "^9.5",
+        "roave/infection-static-analysis-plugin": "^1.6",
         "spatie/phpunit-watcher": "^1.23",
         "vimeo/psalm": "^4.3",
         "yiisoft/di": "3.0.x-dev",

diff --git a/src/ViewRenderer.php b/src/ViewRenderer.php
@@ -57,7 +57,7 @@ public function __construct(
     public function getViewPath(): string
     {
         if ($this->viewPath !== null) {
-            return $this->viewPath;
+            return $this->aliases->get($this->viewPath);
         }
 
         return $this->aliases->get($this->viewBasePath) . ($this->name ? '/' . $this->name : '');

diff --git a/tests/ViewRendererTest.php b/tests/ViewRendererTest.php
@@ -112,6 +112,13 @@ public function testWithViewPath(): void
         $this->assertSame('/dir/', $renderer->getViewPath());
     }
 
+    public function testWithViewPathWithAlias(): void
+    {
+        $renderer = $this->getRenderer()->withViewPath('@views/dir');
+
+        $this->assertSame($this->getViewsDir() . '/dir', $renderer->getViewPath());
+    }
+
     public function testImmutability(): void
     {
         $original = $this->getRenderer();