|
@@ -1,4 +1,5 @@
|
|
|
<?php
|
|
<?php
|
|
|
|
|
+
|
|
|
declare(strict_types=1);
|
|
declare(strict_types=1);
|
|
|
|
|
|
|
|
namespace SixShop\Core\Service;
|
|
namespace SixShop\Core\Service;
|
|
@@ -13,6 +14,7 @@ use SixShop\Core\Request;
|
|
|
use think\event\HttpRun;
|
|
use think\event\HttpRun;
|
|
|
use think\exception\Handle;
|
|
use think\exception\Handle;
|
|
|
use think\Service;
|
|
use think\Service;
|
|
|
|
|
+
|
|
|
use function SixShop\Core\extension_path;
|
|
use function SixShop\Core\extension_path;
|
|
|
|
|
|
|
|
class CoreService extends Service
|
|
class CoreService extends Service
|
|
@@ -41,8 +43,10 @@ class CoreService extends Service
|
|
|
{
|
|
{
|
|
|
$this->app->bind(Handle::class, ExceptionHandle::class);
|
|
$this->app->bind(Handle::class, ExceptionHandle::class);
|
|
|
$this->app->bind('think\Request', Request::class);
|
|
$this->app->bind('think\Request', Request::class);
|
|
|
- $this->app->bind('classLoader',
|
|
|
|
|
- require $this->app->getRootPath() . 'vendor/autoload.php');
|
|
|
|
|
|
|
+ $this->app->bind(
|
|
|
|
|
+ 'classLoader',
|
|
|
|
|
+ require $this->app->getRootPath() . 'vendor/autoload.php'
|
|
|
|
|
+ );
|
|
|
self::$extensionPath = $this->app->getRootPath() . 'extension' . DIRECTORY_SEPARATOR;
|
|
self::$extensionPath = $this->app->getRootPath() . 'extension' . DIRECTORY_SEPARATOR;
|
|
|
$this->initExtensionList();
|
|
$this->initExtensionList();
|
|
|
$this->compatibleExtensionNameList();
|
|
$this->compatibleExtensionNameList();
|
|
@@ -132,4 +136,4 @@ class CoreService extends Service
|
|
|
$this->commands($commands);
|
|
$this->commands($commands);
|
|
|
});
|
|
});
|
|
|
}
|
|
}
|
|
|
-}
|
|
|
|
|
|
|
+}
|