Update Models\Pages

app/Models/Pages/Admin/Bans.php

@@ -14,7 +14,7 @@ use ForkBB\Core\Container;
 use ForkBB\Core\Validator;
 use ForkBB\Models\Page;
 use ForkBB\Models\Pages\Admin;
-use ForkBB\Models\User\Model as User;
+use ForkBB\Models\User\User;
 use RuntimeException;
 use function \ForkBB\__;
 

app/Models/Pages/Admin/Categories.php

@@ -12,7 +12,7 @@ namespace ForkBB\Models\Pages\Admin;
 
 use ForkBB\Core\Container;
 use ForkBB\Models\Page;
-use ForkBB\Models\Forum\Model as Forum;
+use ForkBB\Models\Forum\Forum;
 use ForkBB\Models\Pages\Admin;
 use function \ForkBB\__;
 

app/Models/Pages/Admin/Forums.php

@@ -12,7 +12,7 @@ namespace ForkBB\Models\Pages\Admin;
 
 use ForkBB\Core\Container;
 use ForkBB\Models\Page;
-use ForkBB\Models\Forum\Model as Forum;
+use ForkBB\Models\Forum\Forum;
 use ForkBB\Models\Pages\Admin;
 use function \ForkBB\__;
 

app/Models/Pages/Admin/Groups.php

@@ -12,7 +12,7 @@ namespace ForkBB\Models\Pages\Admin;
 
 use ForkBB\Core\Container;
 use ForkBB\Models\Page;
-use ForkBB\Models\Group\Model as Group;
+use ForkBB\Models\Group\Group;
 use ForkBB\Models\Pages\Admin;
 use function \ForkBB\__;
 

app/Models/Pages/Admin/Maintenance.php

@@ -13,7 +13,7 @@ namespace ForkBB\Models\Pages\Admin;
 use ForkBB\Core\Validator;
 use ForkBB\Models\Page;
 use ForkBB\Models\Pages\Admin;
-use ForkBB\Models\Config\Model as Config;
+use ForkBB\Models\Config\Config;
 use function \ForkBB\__;
 
 class Maintenance extends Admin

app/Models/Pages/Admin/Options.php

@@ -13,7 +13,7 @@ namespace ForkBB\Models\Pages\Admin;
 use ForkBB\Core\Validator;
 use ForkBB\Models\Page;
 use ForkBB\Models\Pages\Admin;
-use ForkBB\Models\Config\Model as Config;
+use ForkBB\Models\Config\Config;
 use function \ForkBB\__;
 
 class Options extends Admin

app/Models/Pages/Admin/Parser/Edit.php

@@ -13,7 +13,7 @@ namespace ForkBB\Models\Pages\Admin\Parser;
 use ForkBB\Core\Validator;
 use ForkBB\Models\Page;
 use ForkBB\Models\Pages\Admin\Parser;
-use ForkBB\Models\Config\Model as Config;
+use ForkBB\Models\Config\Config;
 use function \ForkBB\__;
 
 class Edit extends Parser

app/Models/Pages/Admin/Parser/Smilies.php

@@ -14,7 +14,7 @@ use ForkBB\Core\Image;
 use ForkBB\Core\Validator;
 use ForkBB\Models\Page;
 use ForkBB\Models\Pages\Admin\Parser;
-use ForkBB\Models\Config\Model as Config;
+use ForkBB\Models\Config\Config;
 use function \ForkBB\__;
 
 class Smilies extends Parser

app/Models/Pages/Admin/Reports.php

@@ -12,8 +12,8 @@ namespace ForkBB\Models\Pages\Admin;
 
 use ForkBB\Models\Page;
 use ForkBB\Models\Pages\Admin;
-use ForkBB\Models\Post\Model as Post;
-use ForkBB\Models\Report\Model as Report;
+use ForkBB\Models\Post\Post;
+use ForkBB\Models\Report\Report;
 use function \ForkBB\__;
 
 class Reports extends Admin

app/Models/Pages/Admin/Users.php

@@ -12,7 +12,7 @@ namespace ForkBB\Models\Pages\Admin;
 
 use ForkBB\Core\Container;
 use ForkBB\Models\Pages\Admin;
-use ForkBB\Models\User\Model as User;
+use ForkBB\Models\User\User;
 use function \ForkBB\__;
 
 abstract class Users extends Admin

app/Models/Pages/Admin/Users/Result.php

@@ -13,7 +13,7 @@ namespace ForkBB\Models\Pages\Admin\Users;
 use ForkBB\Core\Validator;
 use ForkBB\Models\Page;
 use ForkBB\Models\Pages\Admin\Users;
-use ForkBB\Models\User\Model as User;
+use ForkBB\Models\User\User;
 use function \ForkBB\__;
 
 class Result extends Users

app/Models/Pages/Auth.php

@@ -13,7 +13,7 @@ namespace ForkBB\Models\Pages;
 use ForkBB\Core\Validator;
 use ForkBB\Core\Exceptions\MailException;
 use ForkBB\Models\Page;
-use ForkBB\Models\User\Model as User;
+use ForkBB\Models\User\User;
 use function \ForkBB\__;
 
 class Auth extends Page

app/Models/Pages/Ban.php

@@ -11,7 +11,7 @@ declare(strict_types=1);
 namespace ForkBB\Models\Pages;
 
 use ForkBB\Models\Page;
-use ForkBB\Models\User\Model as User;
+use ForkBB\Models\User\User;
 use function \ForkBB\__;
 
 class Ban extends Page

app/Models/Pages/Delete.php

@@ -11,7 +11,7 @@ declare(strict_types=1);
 namespace ForkBB\Models\Pages;
 
 use ForkBB\Models\Page;
-use ForkBB\Models\Post\Model as Post;
+use ForkBB\Models\Post\Post;
 use function \ForkBB\__;
 
 class Delete extends Page

app/Models/Pages/Edit.php

@@ -14,9 +14,9 @@ use ForkBB\Core\Validator;
 use ForkBB\Models\Page;
 use ForkBB\Models\Pages\PostFormTrait;
 use ForkBB\Models\Pages\PostValidatorTrait;
-use ForkBB\Models\Poll\Model as Poll;
-use ForkBB\Models\Post\Model as Post;
-use ForkBB\Models\Topic\Model as Topic;
+use ForkBB\Models\Poll\Poll;
+use ForkBB\Models\Post\Post;
+use ForkBB\Models\Topic\Topic;
 use function \ForkBB\__;
 
 class Edit extends Page

app/Models/Pages/Email.php

@@ -12,7 +12,7 @@ namespace ForkBB\Models\Pages;
 
 use ForkBB\Core\Exceptions\MailException;
 use ForkBB\Models\Page;
-use ForkBB\Models\User\Model as User;
+use ForkBB\Models\User\User;
 use function \ForkBB\__;
 
 class Email extends Page

app/Models/Pages/Feed.php

@@ -11,9 +11,9 @@ declare(strict_types=1);
 namespace ForkBB\Models\Pages;
 
 use ForkBB\Models\Page;
-use ForkBB\Models\Forum\Model as Forum;
-use ForkBB\Models\Topic\Model as Topic;
-use ForkBB\Models\User\Model as User;
+use ForkBB\Models\Forum\Forum;
+use ForkBB\Models\Topic\Topic;
+use ForkBB\Models\User\User;
 use RuntimeException;
 use function \ForkBB\__;
 

app/Models/Pages/Forum.php

@@ -11,7 +11,7 @@ declare(strict_types=1);
 namespace ForkBB\Models\Pages;
 
 use ForkBB\Models\Page;
-use ForkBB\Models\Forum\Model as ForumModel;
+use ForkBB\Models\Forum\Forum as ForumModel;
 use function \ForkBB\__;
 
 class Forum extends Page

app/Models/Pages/Misc.php

@@ -11,8 +11,8 @@ declare(strict_types=1);
 namespace ForkBB\Models\Pages;
 
 use ForkBB\Models\Page;
-use ForkBB\Models\Forum\Model as Forum;
-use ForkBB\Models\Topic\Model as Topic;
+use ForkBB\Models\Forum\Forum;
+use ForkBB\Models\Topic\Topic;
 use function \ForkBB\__;
 
 class Misc extends Page

app/Models/Pages/Moderate.php

@@ -13,9 +13,9 @@ namespace ForkBB\Models\Pages;
 use ForkBB\Core\Container;
 use ForkBB\Core\Validator;
 use ForkBB\Models\Page;
-use ForkBB\Models\Forum\Model as Forum;
-use ForkBB\Models\Topic\Model as Topic;
-use ForkBB\Models\Post\Model as Post;
+use ForkBB\Models\Forum\Forum;
+use ForkBB\Models\Topic\Topic;
+use ForkBB\Models\Post\Post;
 use function \ForkBB\__;
 
 class Moderate extends Page

app/Models/Pages/PM/AbstractPM.php

@@ -13,7 +13,7 @@ namespace ForkBB\Models\Pages\PM;
 use ForkBB\Core\Container;
 use ForkBB\Models\Page;
 use ForkBB\Models\PM\Cnst;
-use ForkBB\Models\User\Model as User;
+use ForkBB\Models\User\User;
 use function \ForkBB\__;
 
 abstract class AbstractPM extends Page

app/Models/Pages/PM/PMBlock.php

@@ -16,7 +16,7 @@ use ForkBB\Models\Pages\PM\AbstractPM;
 use ForkBB\Models\PM\Cnst;
 use ForkBB\Models\PM\PPost;
 use ForkBB\Models\PM\PTopic;
-use ForkBB\Models\User\Model as User;
+use ForkBB\Models\User\User;
 use InvalidArgumentException;
 use function \ForkBB\__;
 

app/Models/Pages/Poll.php

@@ -11,8 +11,8 @@ declare(strict_types=1);
 namespace ForkBB\Models\Pages;
 
 use ForkBB\Models\Page;
-use ForkBB\Models\Topic\Model as Topic;
-use ForkBB\Models\Poll\Model as PollModel;
+use ForkBB\Models\Topic\Topic;
+use ForkBB\Models\Poll\Poll as PollModel;
 use function \ForkBB\__;
 
 class Poll extends Page

app/Models/Pages/Post.php

@@ -13,7 +13,7 @@ namespace ForkBB\Models\Pages;
 use ForkBB\Core\Validator;
 use ForkBB\Models\Model;
 use ForkBB\Models\Page;
-use ForkBB\Models\Topic\Model as Topic;
+use ForkBB\Models\Topic\Topic;
 use function \ForkBB\__;
 
 class Post extends Page

app/Models/Pages/Profile.php

@@ -12,7 +12,7 @@ namespace ForkBB\Models\Pages;
 
 use ForkBB\Core\Validator;
 use ForkBB\Models\Page;
-use ForkBB\Models\User\Model as User;
+use ForkBB\Models\User\User;
 use function \ForkBB\__;
 
 abstract class Profile extends Page

app/Models/Pages/Profile/Edit.php

@@ -15,7 +15,7 @@ use ForkBB\Core\Validator;
 use ForkBB\Core\Exceptions\MailException;
 use ForkBB\Models\Page;
 use ForkBB\Models\Pages\Profile;
-use ForkBB\Models\User\Model as User;
+use ForkBB\Models\User\User;
 use function \ForkBB\__;
 
 class Edit extends Profile

app/Models/Pages/Profile/Email.php

@@ -14,7 +14,7 @@ use ForkBB\Core\Validator;
 use ForkBB\Core\Exceptions\MailException;
 use ForkBB\Models\Page;
 use ForkBB\Models\Pages\Profile;
-use ForkBB\Models\User\Model as User;
+use ForkBB\Models\User\User;
 use function \ForkBB\__;
 
 class Email extends Profile

app/Models/Pages/Profile/Mod.php

@@ -14,8 +14,8 @@ use ForkBB\Core\Image;
 use ForkBB\Core\Validator;
 use ForkBB\Models\Page;
 use ForkBB\Models\Pages\Profile;
-use ForkBB\Models\User\Model as User;
-use ForkBB\Models\Forum\Model as Forum;
+use ForkBB\Models\User\User;
+use ForkBB\Models\Forum\Forum;
 use function \ForkBB\__;
 
 class Mod extends Profile

app/Models/Pages/Profile/Pass.php

@@ -15,7 +15,7 @@ use ForkBB\Core\Validator;
 use ForkBB\Core\Exceptions\MailException;
 use ForkBB\Models\Page;
 use ForkBB\Models\Pages\Profile;
-use ForkBB\Models\User\Model as User;
+use ForkBB\Models\User\User;
 use function \ForkBB\__;
 
 class Pass extends Profile

app/Models/Pages/Register.php

@@ -13,7 +13,7 @@ namespace ForkBB\Models\Pages;
 use ForkBB\Core\Validator;
 use ForkBB\Core\Exceptions\MailException;
 use ForkBB\Models\Page;
-use ForkBB\Models\User\Model as User;
+use ForkBB\Models\User\User;
 use function \ForkBB\__;
 
 class Register extends Page

app/Models/Pages/Report.php

@@ -12,8 +12,8 @@ namespace ForkBB\Models\Pages;
 
 use ForkBB\Core\Exceptions\MailException;
 use ForkBB\Models\Page;
-use ForkBB\Models\Post\Model as Post;
-use ForkBB\Models\Report\Model as ReportModel;
+use ForkBB\Models\Post\Post;
+use ForkBB\Models\Report\Report as ReportModel;
 use function \ForkBB\__;
 
 class Report extends Page

app/Models/Pages/Search.php

@@ -12,8 +12,8 @@ namespace ForkBB\Models\Pages;
 
 use ForkBB\Core\Validator;
 use ForkBB\Models\Page;
-use ForkBB\Models\Forum\Model as Forum;
-use ForkBB\Models\User\Model as User;
+use ForkBB\Models\Forum\Forum;
+use ForkBB\Models\User\User;
 use InvalidArgumentException;
 use function \ForkBB\__;
 

app/Models/Pages/Topic.php

@@ -11,7 +11,7 @@ declare(strict_types=1);
 namespace ForkBB\Models\Pages;
 
 use ForkBB\Models\Page;
-use ForkBB\Models\Topic\Model as TopicModel;
+use ForkBB\Models\Topic\Topic as TopicModel;
 use function \ForkBB\__;
 
 class Topic extends Page

app/Models/Pages/Userlist.php

@@ -12,7 +12,7 @@ namespace ForkBB\Models\Pages;
 
 use ForkBB\Core\Validator;
 use ForkBB\Models\Page;
-use ForkBB\Models\Forum\Model as Forum;
+use ForkBB\Models\Forum\Forum;
 use InvalidArgumentException;
 use function \ForkBB\__;
 

app/Models/Rules/Profile.php

@@ -12,7 +12,7 @@ namespace ForkBB\Models\Rules;
 
 use ForkBB\Models\Model;
 use ForkBB\Models\Rules;
-use ForkBB\Models\User\Model as User;
+use ForkBB\Models\User\User;
 
 class Profile extends Rules
 {

app/Models/Rules/Users.php

@@ -12,7 +12,7 @@ namespace ForkBB\Models\Rules;
 
 use ForkBB\Models\Model;
 use ForkBB\Models\Rules;
-use ForkBB\Models\User\Model as User;
+use ForkBB\Models\User\User;
 use ForkBB\Models\Rules\Profile as ProfileRules;
 
 class Users extends Rules