Fix dependencies (#331)

vjik · web-flow · commit 3ec2faecefeb · 2024-09-11T11:17:10.000+03:00
diff --git a/composer.json b/composer.json
@@ -76,15 +76,15 @@
         "yiisoft/router-fastroute": "^3.0",
         "yiisoft/translator": "^3.0",
         "yiisoft/translator-message-php": "^1.1",
-        "yiisoft/view": "^8.0",
+        "yiisoft/view": "^10.0",
         "yiisoft/yii-console": "^2.0",
         "yiisoft/yii-debug": "dev-master|dev-php80",
         "yiisoft/yii-event": "^2.0",
         "yiisoft/yii-http": "^1.0",
         "yiisoft/yii-middleware": "^1.0",
         "yiisoft/yii-runner-console": "^2.0",
         "yiisoft/yii-runner-http": "^2.0",
-        "yiisoft/yii-view": "^6.0"
+        "yiisoft/yii-view-renderer": "^7.1"
     },
     "require-dev": {
         "codeception/c3": "^2.7",
diff --git a/config/common/params.php b/config/common/params.php
@@ -10,7 +10,7 @@
 use Yiisoft\Router\CurrentRoute;
 use Yiisoft\Router\UrlGeneratorInterface;
 use Yiisoft\Translator\TranslatorInterface;
-use Yiisoft\Yii\View\CsrfViewInjection;
+use Yiisoft\Yii\View\Renderer\CsrfViewInjection;
 
 return [
     'app' => [
@@ -39,7 +39,9 @@
         ],
     ],
 
-    'yiisoft/yii-view' => [
+    'yiisoft/yii-view-renderer' => [
+        'viewPath' => '@views',
+        'layout' => '@layout/main.php',
         'injections' => [
             Reference::to(CommonViewInjection::class),
             Reference::to(CsrfViewInjection::class),
diff --git a/src/Controller/SiteController.php b/src/Controller/SiteController.php
@@ -5,7 +5,7 @@
 namespace App\Controller;
 
 use Psr\Http\Message\ResponseInterface;
-use Yiisoft\Yii\View\ViewRenderer;
+use Yiisoft\Yii\View\Renderer\ViewRenderer;
 
 final class SiteController
 {
diff --git a/src/Handler/NotFoundHandler.php b/src/Handler/NotFoundHandler.php
@@ -10,7 +10,7 @@
 use Yiisoft\Http\Status;
 use Yiisoft\Router\UrlGeneratorInterface;
 use Yiisoft\Router\CurrentRoute;
-use Yiisoft\Yii\View\ViewRenderer;
+use Yiisoft\Yii\View\Renderer\ViewRenderer;
 
 final class NotFoundHandler implements RequestHandlerInterface
 {
diff --git a/src/ViewInjection/CommonViewInjection.php b/src/ViewInjection/CommonViewInjection.php
@@ -5,7 +5,7 @@
 namespace App\ViewInjection;
 
 use App\ApplicationParameters;
-use Yiisoft\Yii\View\CommonParametersInjectionInterface;
+use Yiisoft\Yii\View\Renderer\CommonParametersInjectionInterface;
 use Yiisoft\Router\UrlGeneratorInterface;
 
 final class CommonViewInjection implements CommonParametersInjectionInterface
diff --git a/src/ViewInjection/LayoutViewInjection.php b/src/ViewInjection/LayoutViewInjection.php
@@ -8,7 +8,7 @@
 use Yiisoft\Assets\AssetManager;
 use Yiisoft\I18n\Locale;
 use Yiisoft\Router\CurrentRoute;
-use Yiisoft\Yii\View\LayoutParametersInjectionInterface;
+use Yiisoft\Yii\View\Renderer\LayoutParametersInjectionInterface;
 
 final class LayoutViewInjection implements LayoutParametersInjectionInterface
 {
diff --git a/src/ViewInjection/TranslatorViewInjection.php b/src/ViewInjection/TranslatorViewInjection.php
@@ -5,7 +5,7 @@
 namespace App\ViewInjection;
 
 use Yiisoft\Translator\TranslatorInterface;
-use Yiisoft\Yii\View\CommonParametersInjectionInterface;
+use Yiisoft\Yii\View\Renderer\CommonParametersInjectionInterface;
 
 final class TranslatorViewInjection implements CommonParametersInjectionInterface
 {

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`	`namespace App\Controller;`
`6`	`6`
`7`	`7`	`use Psr\Http\Message\ResponseInterface;`
`8`		`-use Yiisoft\Yii\View\ViewRenderer;`
	`8`	`+use Yiisoft\Yii\View\Renderer\ViewRenderer;`
`9`	`9`
`10`	`10`	`final class SiteController`
`11`	`11`	`{`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@`
`10`	`10`	`use Yiisoft\Http\Status;`
`11`	`11`	`use Yiisoft\Router\UrlGeneratorInterface;`
`12`	`12`	`use Yiisoft\Router\CurrentRoute;`
`13`		`-use Yiisoft\Yii\View\ViewRenderer;`
	`13`	`+use Yiisoft\Yii\View\Renderer\ViewRenderer;`
`14`	`14`
`15`	`15`	`final class NotFoundHandler implements RequestHandlerInterface`
`16`	`16`	`{`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`use Yiisoft\Assets\AssetManager;`
`9`	`9`	`use Yiisoft\I18n\Locale;`
`10`	`10`	`use Yiisoft\Router\CurrentRoute;`
`11`		`-use Yiisoft\Yii\View\LayoutParametersInjectionInterface;`
	`11`	`+use Yiisoft\Yii\View\Renderer\LayoutParametersInjectionInterface;`
`12`	`12`
`13`	`13`	`final class LayoutViewInjection implements LayoutParametersInjectionInterface`
`14`	`14`	`{`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`	`namespace App\ViewInjection;`
`6`	`6`
`7`	`7`	`use Yiisoft\Translator\TranslatorInterface;`
`8`		`-use Yiisoft\Yii\View\CommonParametersInjectionInterface;`
	`8`	`+use Yiisoft\Yii\View\Renderer\CommonParametersInjectionInterface;`
`9`	`9`
`10`	`10`	`final class TranslatorViewInjection implements CommonParametersInjectionInterface`
`11`	`11`	`{`