Adopt to new yiisoft/view and yiisoft/yii-view (#194)

yiisoft · Sep 18, 2021 · cb52b78 · cb52b78
1 parent 6c92e04
commit cb52b78
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 15 deletions.
diff --git a/composer.json b/composer.json
@@ -42,12 +42,12 @@
         "yiisoft/log-target-file": "^1.0",
         "yiisoft/router": "@dev",
         "yiisoft/router-fastroute": "@dev",
-        "yiisoft/view": "^2.0",
+        "yiisoft/view": "^3.0",
         "yiisoft/yii-bulma": "@dev",
         "yiisoft/yii-console": "3.0.x-dev",
         "yiisoft/yii-debug": "^3.0@dev",
         "yiisoft/yii-event": "^1.0",
-        "yiisoft/yii-view": "^2.0",
+        "yiisoft/yii-view": "^3.0",
         "yiisoft/yii-web": "^3.0@dev"
     },
     "require-dev": {

diff --git a/config/params.php b/config/params.php
@@ -3,7 +3,7 @@
 declare(strict_types=1);
 
 use App\Command\Hello;
-use App\ViewInjection\ContentViewInjection;
+use App\ViewInjection\CommonViewInjection;
 use App\ViewInjection\LayoutViewInjection;
 use Yiisoft\Definitions\Reference;
 use Yiisoft\Yii\View\CsrfViewInjection;
@@ -34,7 +34,7 @@
 
     'yiisoft/yii-view' => [
         'injections' => [
-            Reference::to(ContentViewInjection::class),
+            Reference::to(CommonViewInjection::class),
             Reference::to(CsrfViewInjection::class),
             Reference::to(LayoutViewInjection::class),
         ],

diff --git a/resources/views/site/index.php b/resources/views/site/index.php
@@ -2,9 +2,10 @@
 
 declare(strict_types=1);
 
-/** @var App\ApplicationParameters $applicationParameters */
-
-$this->params['breadcrumbs'] = '/';
+/**
+ * @var \Yiisoft\View\WebView $this
+ * @var \App\ApplicationParameters $applicationParameters
+ */
 
 $this->setTitle($applicationParameters->getName());
 ?>

diff --git a/src/ViewInjection/ContentViewInjection.php → src/ViewInjection/CommonViewInjection.php b/src/ViewInjection/ContentViewInjection.php → src/ViewInjection/CommonViewInjection.php
@@ -5,9 +5,9 @@
 namespace App\ViewInjection;
 
 use App\ApplicationParameters;
-use Yiisoft\Yii\View\ContentParametersInjectionInterface;
+use Yiisoft\Yii\View\CommonParametersInjectionInterface;
 
-final class ContentViewInjection implements ContentParametersInjectionInterface
+final class CommonViewInjection implements CommonParametersInjectionInterface
 {
     private ApplicationParameters $applicationParameters;
 
@@ -17,7 +17,7 @@ public function __construct(
         $this->applicationParameters = $applicationParameters;
     }
 
-    public function getContentParameters(): array
+    public function getCommonParameters(): array
     {
         return [
             'applicationParameters' => $this->applicationParameters,

diff --git a/src/ViewInjection/LayoutViewInjection.php b/src/ViewInjection/LayoutViewInjection.php
@@ -4,7 +4,6 @@
 
 namespace App\ViewInjection;
 
-use App\ApplicationParameters;
 use Yiisoft\Assets\AssetManager;
 use Yiisoft\I18n\Locale;
 use Yiisoft\Router\UrlGeneratorInterface;
@@ -13,20 +12,17 @@
 
 final class LayoutViewInjection implements LayoutParametersInjectionInterface
 {
-    private ApplicationParameters $applicationParameters;
     private AssetManager $assetManager;
     private Locale $locale;
     private UrlGeneratorInterface $urlGenerator;
     private CurrentRoute $currentRoute;
 
     public function __construct(
-        ApplicationParameters $applicationParameters,
         AssetManager $assetManager,
         Locale $locale,
         UrlGeneratorInterface $urlGenerator,
         CurrentRoute $currentRoute
     ) {
-        $this->applicationParameters = $applicationParameters;
         $this->assetManager = $assetManager;
         $this->locale = $locale;
         $this->urlGenerator = $urlGenerator;
@@ -36,7 +32,6 @@ public function __construct(
     public function getLayoutParameters(): array
     {
         return [
-            'applicationParameters' => $this->applicationParameters,
             'assetManager' => $this->assetManager,
             'locale' => $this->locale,
             'urlGenerator' => $this->urlGenerator,