Add parameters injections to ViewRenderer + minor refactoring

composer.json

@@ -20,7 +20,6 @@
         "php": "^7.4|^8.0",
         "cebe/markdown": "^1.2@dev",
         "cycle/proxy-factory": "^1.2",
-        "yiisoft/composer-config-plugin": "^1.0@dev",
         "nyholm/psr7": "^1.0",
         "psr/log": "^1.1",
         "yiisoft/access": "^1.0",
@@ -30,9 +29,10 @@
         "yiisoft/auth": "^1.0",
         "yiisoft/cache": "^3.0@dev",
         "yiisoft/cache-file": "^3.0@dev",
+        "yiisoft/composer-config-plugin": "^1.0@dev",
         "yiisoft/data": "^3.0@dev",
+        "yiisoft/data-response": "^3.0@dev",
         "yiisoft/di": "^3.0@dev",
-        "yiisoft/yii-event": "^3.0@dev",
         "yiisoft/factory": "^3.0@dev",
         "yiisoft/html": "^3.0@dev",
         "yiisoft/injector": "^1.0",
@@ -45,18 +45,19 @@
         "yiisoft/router": "^3.0@dev",
         "yiisoft/router-fastroute": "^3.0@dev",
         "yiisoft/security": "^3.0@dev",
+        "yiisoft/serializer": "^3.0@dev",
         "yiisoft/strings": "^1.0",
         "yiisoft/var-dumper": "^3.0@dev",
         "yiisoft/view": "^3.0@dev",
         "yiisoft/widget": "^3.0@dev",
+        "yiisoft/yii-bootstrap4": "^3.0@dev",
         "yiisoft/yii-console": "^3.0@dev",
         "yiisoft/yii-cycle": "^3.0@dev",
-        "yiisoft/yii-web": "^3.0@dev",
         "yiisoft/yii-debug": "^3.0@dev",
         "yiisoft/yii-debug-api": "^3.0@dev",
-        "yiisoft/serializer": "^3.0@dev",
-        "yiisoft/data-response": "^3.0@dev",
-        "yiisoft/yii-bootstrap4": "^3.0@dev"
+        "yiisoft/yii-event": "^3.0@dev",
+        "yiisoft/yii-view": "^3.0@dev",
+        "yiisoft/yii-web": "^3.0@dev"
     },
     "require-dev": {
         "roave/security-advisories": "dev-master",

config/params.php

@@ -1,7 +1,9 @@
 <?php
 
+use App\ApplicationViewInjection;
 use App\Command;
 use Cycle\Schema\Generator;
+use Yiisoft\Factory\Definitions\Reference;
 
 return [
     'yiisoft/yii-debug' => [
@@ -40,17 +42,17 @@
 
     'yiisoft/yii-cycle' => [
         'dbal' => [
-            'default'     => 'default',
-            'aliases'     => [],
-            'databases'   => [
+            'default' => 'default',
+            'aliases' => [],
+            'databases' => [
                 'default' => ['connection' => 'sqlite']
             ],
             'connections' => [
                 'sqlite' => [
-                    'driver'     => \Spiral\Database\Driver\SQLite\SQLiteDriver::class,
+                    'driver' => \Spiral\Database\Driver\SQLite\SQLiteDriver::class,
                     'connection' => 'sqlite:@runtime/database.db',
-                    'username'   => '',
-                    'password'   => '',
+                    'username' => '',
+                    'password' => '',
                 ],
             ],
             // 'query-logger' => \Yiisoft\Yii\Cycle\Logger\StdoutQueryLogger::class,
@@ -80,4 +82,10 @@
             '@src/Blog/Entity',
         ],
     ],
+
+    'yiisoft/yii-view' => [
+        'injections' => [
+            Reference::to(ApplicationViewInjection::class),
+        ],
+    ],
 ];

config/web.php

@@ -1,10 +1,11 @@
 <?php
 
+declare(strict_types=1);
+
 use App\Blog\Comment\CommentRepository;
 use App\Blog\Comment\CommentService;
 use App\Contact\ContactMailer;
 use App\Factory\MiddlewareDispatcherFactory;
-use App\ViewRenderer;
 use Nyholm\Psr7\Factory\Psr17Factory;
 use Psr\Container\ContainerInterface;
 use Psr\Http\Message\RequestFactoryInterface;
@@ -19,9 +20,9 @@
 use Yiisoft\DataResponse\DataResponseFactoryInterface;
 use Yiisoft\DataResponse\DataResponseFormatterInterface;
 use Yiisoft\DataResponse\Formatter\HtmlDataResponseFormatter;
+use Yiisoft\Session\Session;
+use Yiisoft\Session\SessionInterface;
 use Yiisoft\Yii\Web\MiddlewareDispatcher;
-use Yiisoft\Yii\Web\Session\Session;
-use Yiisoft\Yii\Web\Session\SessionInterface;
 use App\Repository\UserRepository;
 
 /**
@@ -57,10 +58,4 @@
             $container->get(CommentRepository::class)
         );
     },
-    ViewRenderer::class => [
-        '__construct()' => [
-            'viewBasePath' => '@views',
-            'layout' => '@views/layout/main',
-        ],
-    ],
 ];

src/ApplicationViewInjection.php

@@ -0,0 +1,60 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App;
+
+use Yiisoft\Router\UrlMatcherInterface;
+use Yiisoft\Yii\View\LayoutParametersInjectionInterface;
+use Yiisoft\Yii\View\LinkTagsInjectionInterface;
+use Yiisoft\Yii\View\MetaTagsInjectionInterface;
+use Yiisoft\Yii\Web\User\User;
+
+class ApplicationViewInjection implements
+    LayoutParametersInjectionInterface,
+    MetaTagsInjectionInterface,
+    LinkTagsInjectionInterface
+{
+
+    private User $user;
+    private UrlMatcherInterface $urlMatcher;
+
+    public function __construct(
+        User $user,
+        UrlMatcherInterface $urlMatcher
+    ) {
+        $this->user = $user;
+        $this->urlMatcher = $urlMatcher;
+    }
+
+    public function getLayoutParameters(): array
+    {
+        return [
+            'user' => $this->user->getIdentity(),
+            'currentUrl' => (string)$this->urlMatcher->getLastMatchedRequest()->getUri(),
+            'brandLabel' => 'Yii Demo',
+        ];
+    }
+
+    public function getMetaTags(): array
+    {
+        return [
+            [
+                '__key' => 'generator',
+                'name' => 'generator',
+                'value' => 'Yii',
+            ],
+        ];
+    }
+
+    public function getLinkTags(): array
+    {
+        return [
+            [
+                '__key' => 'favicon',
+                'name' => 'icon',
+                'value' => '/favicon.ico',
+            ],
+        ];
+    }
+}

src/Blog/Archive/ArchiveController.php

@@ -1,12 +1,14 @@
 <?php
 
+declare(strict_types=1);
+
 namespace App\Blog\Archive;
 
 use App\Blog\Tag\TagRepository;
-use App\ViewRenderer;
 use Psr\Http\Message\ResponseInterface as Response;
 use Psr\Http\Message\ServerRequestInterface as Request;
 use Yiisoft\Data\Paginator\OffsetPaginator;
+use Yiisoft\Yii\View\ViewRenderer;
 
 final class ArchiveController
 {

src/Blog/BlogController.php

@@ -7,10 +7,10 @@
 use App\Blog\Archive\ArchiveRepository;
 use App\Blog\Post\PostRepository;
 use App\Blog\Tag\TagRepository;
-use App\ViewRenderer;
 use Psr\Http\Message\ResponseInterface as Response;
 use Psr\Http\Message\ServerRequestInterface as Request;
 use Yiisoft\Data\Paginator\OffsetPaginator;
+use Yiisoft\Yii\View\ViewRenderer;
 use Yiisoft\Yii\Web\User\User;
 
 final class BlogController

src/Blog/CommentController.php

@@ -5,9 +5,9 @@
 namespace App\Blog;
 
 use App\Blog\Comment\CommentService;
-use App\ViewRenderer;
 use Psr\Http\Message\ResponseInterface as Response;
 use Psr\Http\Message\ServerRequestInterface as Request;
+use Yiisoft\Yii\View\ViewRenderer;
 
 final class CommentController
 {

src/Blog/Post/PostController.php

@@ -1,11 +1,12 @@
 <?php
 
+declare(strict_types=1);
+
 namespace App\Blog\Post;
 
 use App\Blog\Entity\Post;
 use App\Blog\Entity\Tag;
 use App\Entity\User;
-use App\ViewRenderer;
 use Cycle\ORM\ORMInterface;
 use Cycle\ORM\Transaction;
 use Psr\Http\Message\ResponseFactoryInterface;
@@ -15,6 +16,7 @@
 use Yiisoft\Access\AccessCheckerInterface;
 use Yiisoft\Http\Method;
 use Yiisoft\Router\UrlGeneratorInterface;
+use Yiisoft\Yii\View\ViewRenderer;
 use Yiisoft\Yii\Web\User\User as UserComponent;
 
 final class PostController

src/Blog/Tag/TagController.php

@@ -1,13 +1,15 @@
 <?php
 
+declare(strict_types=1);
+
 namespace App\Blog\Tag;
 
 use App\Blog\Post\PostRepository;
-use App\ViewRenderer;
 use Psr\Http\Message\ResponseFactoryInterface;
 use Psr\Http\Message\ResponseInterface as Response;
 use Psr\Http\Message\ServerRequestInterface as Request;
 use Yiisoft\Data\Paginator\OffsetPaginator;
+use Yiisoft\Yii\View\ViewRenderer;
 
 final class TagController
 {

src/Contact/ContactController.php

@@ -1,12 +1,14 @@
 <?php
 
+declare(strict_types=1);
+
 namespace App\Contact;
 
-use App\ViewRenderer;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
 use Psr\Log\LoggerInterface;
 use Yiisoft\Http\Method;
+use Yiisoft\Yii\View\ViewRenderer;
 
 class ContactController
 {

src/Controller/AuthController.php

@@ -1,15 +1,17 @@
 <?php
 
+declare(strict_types=1);
+
 namespace App\Controller;
 
-use App\ViewRenderer;
 use Psr\Http\Message\ResponseFactoryInterface;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
 use Psr\Log\LoggerInterface;
 use Yiisoft\Auth\IdentityRepositoryInterface;
 use Yiisoft\Http\Method;
 use Yiisoft\Router\UrlGeneratorInterface;
+use Yiisoft\Yii\View\ViewRenderer;
 use Yiisoft\Yii\Web\User\User;
 
 class AuthController
@@ -75,10 +77,9 @@ public function login(
             }
         }
 
-        return $this->viewRenderer->render(
+        return $this->viewRenderer->withCsrf()->render(
             'login',
             [
-                'csrf' => $request->getAttribute('csrf_token'),
                 'body' => $body,
                 'error' => $error,
             ]

src/Controller/SignupController.php

@@ -1,9 +1,10 @@
 <?php
 
+declare(strict_types=1);
+
 namespace App\Controller;
 
 use App\Entity\User;
-use App\ViewRenderer;
 use Cycle\ORM\ORMInterface;
 use Cycle\ORM\Transaction;
 use Psr\Http\Message\RequestInterface;
@@ -13,6 +14,7 @@
 use Yiisoft\Auth\IdentityRepositoryInterface;
 use Yiisoft\Http\Method;
 use Yiisoft\Router\UrlGeneratorInterface;
+use Yiisoft\Yii\View\ViewRenderer;
 
 final class SignupController
 {
@@ -66,12 +68,11 @@ public function signup(
             }
         }
 
-        return $this->viewRenderer->render(
+        return $this->viewRenderer->withCsrf()->render(
             'signup',
             [
                 'body' => $body,
                 'error' => $error,
-                'csrf' => $request->getAttribute('csrf_token'),
             ]
         );
     }

src/Controller/SiteController.php

@@ -1,9 +1,11 @@
 <?php
 
+declare(strict_types=1);
+
 namespace App\Controller;
 
 use Psr\Http\Message\ResponseInterface;
-use App\ViewRenderer;
+use Yiisoft\Yii\View\ViewRenderer;
 
 class SiteController
 {

src/Controller/UserController.php

@@ -1,14 +1,16 @@
 <?php
 
+declare(strict_types=1);
+
 namespace App\Controller;
 
 use App\Repository\UserRepository;
-use App\ViewRenderer;
 use Psr\Http\Message\ResponseFactoryInterface;
 use Psr\Http\Message\ResponseInterface as Response;
 use Psr\Http\Message\ServerRequestInterface as Request;
 use Yiisoft\Data\Paginator\OffsetPaginator;
 use Yiisoft\Data\Reader\Sort;
+use Yiisoft\Yii\View\ViewRenderer;
 
 class UserController
 {

src/Factory/MiddlewareDispatcherFactory.php

@@ -3,18 +3,18 @@
 namespace App\Factory;
 
 use Psr\Container\ContainerInterface;
+use Yiisoft\Csrf\CsrfMiddleware;
 use Yiisoft\Router\Middleware\Router;
+use Yiisoft\Session\SessionMiddleware;
 use Yiisoft\Yii\Web\ErrorHandler\ErrorCatcher;
-use Yiisoft\Yii\Web\Middleware\Csrf;
 use Yiisoft\Yii\Web\Middleware\SubFolder;
 use Yiisoft\Yii\Web\MiddlewareDispatcher;
-use Yiisoft\Yii\Web\Session\SessionMiddleware;
 
 final class MiddlewareDispatcherFactory
 {
     public function __invoke(ContainerInterface $container)
     {
-        $csrf = $container->get(Csrf::class);
+        $csrf = $container->get(CsrfMiddleware::class);
         $session = $container->get(SessionMiddleware::class);
         $router = $container->get(Router::class);
         $errorCatcher = $container->get(ErrorCatcher::class);