chore(User): Make User component as Part of App but not framework

Rhilip · Mar 17, 2019 · 233e62d · 233e62d
1 parent ada223c
commit 233e62d
Show file tree

Hide file tree

Showing 11 changed files with 15 additions and 15 deletions.
diff --git a/framework/User/User.php → apps/components/User/User.php b/framework/User/User.php → apps/components/User/User.php
@@ -6,7 +6,7 @@
  * Time: 19:30
  */
 
-namespace Rid\User;
+namespace apps\components\User;
 
 use Rid\Base\Component;
 

diff --git a/framework/User/UserInterface.php → apps/components/User/UserInterface.php b/framework/User/UserInterface.php → apps/components/User/UserInterface.php
@@ -6,7 +6,7 @@
  * Time: 11:39
  */
 
-namespace Rid\User;
+namespace apps\components\User;
 
 interface UserInterface
 {

diff --git a/framework/User/UserTrait.php → apps/components/User/UserTrait.php b/framework/User/UserTrait.php → apps/components/User/UserTrait.php
@@ -6,7 +6,7 @@
  * Time: 20:24
  */
 
-namespace Rid\User;
+namespace apps\components\User;
 
 use Rid\Exceptions\NotFoundException;
 use Rid\Utils\AttributesImportUtils;

diff --git a/apps/config/http_base.php b/apps/config/http_base.php
@@ -196,17 +196,17 @@
             'class'   => Rid\Component\Config::class,
         ],
 
-        'user' => [
-            'class' => Rid\User\User::class,
-        ],
-
         'i18n' => [
             'class' => Rid\Component\I18n::class,
             'fileNamespace' => 'apps\lang',
             'fallbackLang' => 'en',
             'forcedLang' => null,
             'allowedLangSet' => ['en', 'zh-CN']
         ],
+
+        'user' => [
+            'class' => apps\components\User\User::class,
+        ],
     ],
 
     // 类库配置

diff --git a/apps/controllers/TrackerController.php b/apps/controllers/TrackerController.php
@@ -8,7 +8,7 @@
 
 namespace apps\controllers;
 
-use Rid\User\UserInterface;
+use apps\components\User\UserInterface;
 use Rid\Utils\IpUtils;
 use Rid\Bencode\Bencode;
 

diff --git a/apps/models/User.php b/apps/models/User.php
@@ -2,8 +2,8 @@
 
 namespace apps\models;
 
-use \Rid\User\UserInterface;
-use \Rid\User\UserTrait;
+use \apps\components\User\UserInterface;
+use \apps\components\User\UserTrait;
 
 class User implements UserInterface
 {

diff --git a/apps/models/form/UserConfirmForm.php b/apps/models/form/UserConfirmForm.php
@@ -8,7 +8,7 @@
 
 namespace apps\models\form;
 
-use Rid\User\UserInterface;
+use apps\components\User\UserInterface;
 use Rid\Validators\Validator;
 
 

diff --git a/apps/models/form/UserLoginForm.php b/apps/models/form/UserLoginForm.php
@@ -9,7 +9,7 @@
 namespace apps\models\form;
 
 use Rid\Helpers\StringHelper;
-use Rid\User\UserInterface;
+use apps\components\User\UserInterface;
 
 use Rid\Validators\CaptchaTrait;
 use Rid\Validators\Validator;

diff --git a/apps/views/layout/base.php b/apps/views/layout/base.php
@@ -59,7 +59,7 @@
         <div class="pull-left">
             Welcome Back, <a href="/user" data-user-id="<?= app()->user->getId() ?>"><?= app()->user->getUsername() ?></a>&nbsp;
             <span data-item="logout"><!--suppress HtmlUnknownTarget --><a href="/auth/logout">[Logout]</a></span>&nbsp;
-            <?php if (app()->user->getClass(true) > \Rid\User\UserInterface::ROLE_FORUM_MODERATOR): ?>
+            <?php if (app()->user->getClass(true) > \apps\components\User\UserInterface::ROLE_FORUM_MODERATOR): ?>
                 <span><!--suppress HtmlUnknownTarget --><a href="/admin">[Admin Panel]</a></span>&nbsp;
             <?php endif; ?>
             <span data-item="favour"><!--suppress HtmlUnknownTarget --><a href="/torrents/favour">[Favour]</a></span>&nbsp;

diff --git a/apps/views/user/panel.php b/apps/views/user/panel.php
@@ -5,7 +5,7 @@
  * Date: 2019/2/22
  * Time: 17:13
  *
- * @var \Rid\User\UserTrait $user
+ * @var \apps\components\User\UserTrait $user
  */
 ?>
 

diff --git a/framework/Base/Application.php b/framework/Base/Application.php
@@ -16,8 +16,8 @@
  * @property \Rid\Redis\RedisConnection $redis
  * @property \Rid\Component\Config $config
  * @property \Rid\Pool\ConnectionPool $connectionPool
- * @property \Rid\User\User $user
  * @property \Rid\Component\I18n $i18n
+ * @property \apps\components\User\User $user
  */
 class Application extends BaseObject
 {