diff --git a/plugin/think-library/tests/ArchitectureBoundaryTest.php b/plugin/think-library/tests/ArchitectureBoundaryTest.php index 3d04edc4e..6e57ff391 100644 --- a/plugin/think-library/tests/ArchitectureBoundaryTest.php +++ b/plugin/think-library/tests/ArchitectureBoundaryTest.php @@ -396,6 +396,8 @@ class ArchitectureBoundaryTest extends TestCase 'plugin\wemall\integration\\', 'plugin\wuma\Query', 'plugin\wuma\Script', + 'class_' . 'alias(', + 'ThinkAdmin' . 'Developer', 'usession(', 'user_session_store', 'user_session_touch', diff --git a/plugin/think-plugs-system/src/common.php b/plugin/think-plugs-system/src/common.php index e71addf74..055348f98 100644 --- a/plugin/think-plugs-system/src/common.php +++ b/plugin/think-plugs-system/src/common.php @@ -32,23 +32,6 @@ if (!Container::getInstance()->bound(StorageManagerInterface::class) && class_ex Container::getInstance()->bind(StorageManagerInterface::class, StorageManager::class); } -foreach ([ - 'think\\admin\\model\\SystemAuth' => \plugin\system\model\SystemAuth::class, - 'think\\admin\\model\\SystemBase' => \plugin\system\model\SystemBase::class, - 'think\\admin\\model\\SystemFile' => \plugin\system\model\SystemFile::class, - 'think\\admin\\model\\SystemMenu' => \plugin\system\model\SystemMenu::class, - 'think\\admin\\model\\SystemNode' => \plugin\system\model\SystemNode::class, - 'think\\admin\\model\\SystemOplog' => \plugin\system\model\SystemOplog::class, - 'think\\admin\\model\\SystemUser' => \plugin\system\model\SystemUser::class, - 'think\\admin\\service\\AdminService' => \plugin\system\service\AuthService::class, - 'think\\admin\\service\\CaptchaService' => \plugin\system\service\CaptchaService::class, - 'think\\admin\\service\\MenuService' => \plugin\system\service\MenuService::class, - 'think\\admin\\service\\SystemService' => \plugin\system\service\SystemService::class, -] as $legacy => $target) { - if (!class_exists($legacy, false) && class_exists($target)) { - class_alias($target, $legacy); - } -} if (!function_exists('auth')) { /** diff --git a/plugin/think-plugs-worker/src/common.php b/plugin/think-plugs-worker/src/common.php index 7c447659f..4ef81bf88 100644 --- a/plugin/think-plugs-worker/src/common.php +++ b/plugin/think-plugs-worker/src/common.php @@ -20,14 +20,6 @@ declare(strict_types=1); use think\admin\Exception; use think\admin\service\QueueService; -foreach ([ - 'think\\admin\\model\\SystemQueue' => \plugin\worker\model\SystemQueue::class, - 'think\\admin\\service\\ProcessService' => \plugin\worker\service\ProcessService::class, -] as $legacy => $target) { - if (!class_exists($legacy, false) && class_exists($target)) { - class_alias($target, $legacy); - } -} if (!function_exists('sysqueue')) { /** diff --git a/plugin/think-plugs-worker/src/service/HttpServer.php b/plugin/think-plugs-worker/src/service/HttpServer.php index 9d2f145a1..579fb6a04 100644 --- a/plugin/think-plugs-worker/src/service/HttpServer.php +++ b/plugin/think-plugs-worker/src/service/HttpServer.php @@ -81,10 +81,6 @@ class HttpServer extends Server Http::class => ThinkHttp::class, ]); - if (!class_exists('think\response\File', false)) { - class_alias(ThinkResponseFile::class, 'think\response\File'); - } - RuntimeService::init($this->app)->initialize(); $this->app->http->warmup();