Update controller and params configuration.

yii2-extensions · Dec 8, 2023 · 1de365b · 1de365b
1 parent 58ddecc
commit 1de365b
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 25 deletions.
diff --git a/config/params.php b/config/params.php
@@ -12,7 +12,11 @@
         '@yii-user/mailer' => '@yii-user/src/Framework/resource/mailer',
         '@yii-user/migration' => '@yii-user/src/Framework/Migration',
     ],
-    'app.controllerMap' => [
+    'console.aliases' => [
+        '@yii-user' => '@vendor/yii2-extensions/user',
+        '@yii-user/migration' => '@yii-user/src/Framework/Migration',
+    ],
+    'web.controllerMap' => [
         'login' => [
             'class' => LoginController::class,
         ],
@@ -23,21 +27,4 @@
             'class' => RegisterController::class,
         ],
     ],
-    'app.params' => [
-        'app.menu.islogged' => [
-            [
-                'label' => 'Logout',
-                'url' => ['/logout/index'],
-                'order' => 1,
-                'category' => 'yii.user',
-                'linkOptions' => [
-                    'data-method' => 'post',
-                ],
-            ],
-        ],
-    ],
-    'console.aliases' => [
-        '@yii-user' => '@vendor/yii2-extensions/user',
-        '@yii-user/migration' => '@yii-user/src/Framework/Migration',
-    ],
 ];
diff --git a/config/tests/params-web.php b/config/tests/params-web.php
@@ -5,12 +5,12 @@
 use App\UseCase\Site\SiteController;
 
 return [
-    'app.controllerMap' => [
+    'web.controllerMap' => [
         'site' => [
             'class' => SiteController::class,
         ],
     ],
-    'app.params' => [
+    'web.params' => [
         'app.menu.isguest' => [
             [
                 'label' => 'Register',
@@ -25,6 +25,17 @@
                 'category' => 'yii.user',
             ],
         ],
+        'app.menu.islogged' => [
+            [
+                'label' => 'Logout',
+                'url' => ['/logout/index'],
+                'order' => 1,
+                'category' => 'yii.user',
+                'linkOptions' => [
+                    'data-method' => 'post',
+                ],
+            ],
+        ],
         'icons' => '@npm/fortawesome--fontawesome-free/svgs/{family}/{name}.svg',
     ],
 ];
diff --git a/config/tests/web/app.php b/config/tests/web/app.php
@@ -20,13 +20,13 @@
     ],
     'basePath' => dirname(__DIR__, 3),
     'bootstrap' => ['log'],
-    'controllerMap' => $params['app.controllerMap'],
+    'controllerMap' => $params['web.controllerMap'],
     'id' => 'app-tests',
     'language' => 'en-US',
     'name' => 'Web application basic',
     'on beforeAction' => static function (): void {
         $_SERVER['REMOTE_ADDR'] = '127.0.0.1';
     },
-    'params' => $params['app.params'] ?? [],
+    'params' => $params['web.params'] ?? [],
     'runtimePath' => dirname(__DIR__, 3) . '/tests/public/runtime',
 ];
diff --git a/config/web/container.php b/config/web/container.php
@@ -4,8 +4,6 @@
 
 use yii\symfonymailer\Mailer;
 use Yii\User\ActiveRecord\Identity;
-use Yii\User\Framework\Repository\PersistenceRepository;
-use Yii\User\Framework\Repository\PersistenceRepositoryInterface;
 use yii\web\User;
 
 return [
@@ -14,7 +12,6 @@
             Mailer::class => [
                 'useFileTransport' => true,
             ],
-            PersistenceRepositoryInterface::class => PersistenceRepository::class,
             User::class => [
                 'identityClass' => Identity::class,
                 'loginUrl' => ['/login/index'],