eee

kiri-engine/Abstracts/BaseApplication.php

@@ -12,7 +12,6 @@ namespace Kiri\Abstracts;
 
 use Database\DatabasesProviders;
 use Exception;
-use Kiri;
 use Kiri\Events\EventInterface;
 use Kiri\Config\ConfigProvider;
 use Kiri\Exception\{InitException};

kiri-engine/Application.php

@@ -27,6 +27,7 @@ use Symfony\Component\Console\{Application as ConsoleApplication,
 };
 use Kiri\Server\ServerCommand;
 use Kiri\Di\Inject\Container;
+use function config;
 
 /**
  * Class Init
@@ -58,10 +59,10 @@ class Application extends BaseApplication
      */
     public function init(): void
     {
-        $this->errorHandler->registerShutdownHandler(\config('error.shutdown', []));
-        $this->errorHandler->registerExceptionHandler(\config('error.exception', []));
-        $this->errorHandler->registerErrorHandler(\config('error.error', []));
-        $this->id = \config('id', uniqid('id.'));
+        $this->errorHandler->registerShutdownHandler(config('error.shutdown', []));
+        $this->errorHandler->registerExceptionHandler(config('error.exception', []));
+        $this->errorHandler->registerErrorHandler(config('error.error', []));
+        $this->id = config('id', uniqid('id.'));
 
         $this->provider->on(OnBeforeCommandExecute::class, [$this, 'beforeCommandExecute']);
     }
@@ -78,12 +79,10 @@ class Application extends BaseApplication
     {
         if (!($beforeCommandExecute->command instanceof ServerCommand)) {
             $scanner = $this->container->get(Scanner::class);
-            $scanner->read(APP_PATH . 'app/');
-            $scanner->parse('App');
-        } else if (\config('reload.hot', false) === false) {
+            $scanner->load_directory(APP_PATH . 'app/');
+        } else if (config('reload.hot', false) === false) {
             $scanner = $this->container->get(Scanner::class);
-            $scanner->read(APP_PATH . 'app/');
-            $scanner->parse('App');
+            $scanner->load_directory(APP_PATH . 'app/');
         }
     }
 

kiri-engine/Environmental.php

@@ -8,7 +8,6 @@ namespace Kiri;
 
 
 use JetBrains\PhpStorm\Pure;
-use Kiri;
 
 /**
  * Class Environmental

kiri-engine/Error/ErrorHandler.php

@@ -12,7 +12,6 @@ namespace Kiri\Error;
 use Closure;
 use ErrorException;
 use Exception;
-use Kiri;
 use Kiri\Abstracts\Component;
 use Psr\Container\ContainerInterface;
 use Kiri\Di\Inject\Container;

kiri-engine/Redis/Redis.php

@@ -13,7 +13,8 @@ use Exception;
 use Kiri;
 use Kiri\Exception\RedisConnectException;
 use Kiri\Pool\Pool;
-use function println;
+use RedisException;
+use function config;
 
 /**
  * Class Redis
@@ -52,7 +53,7 @@ class Redis
      */
     public function __construct()
     {
-        Kiri::configure($this, \config('redis', []));
+        Kiri::configure($this, config('redis', []));
     }
 
     /**
@@ -84,6 +85,7 @@ class Redis
      * @param $key
      * @param int $timeout
      * @return bool
+     * @throws RedisException
      */
     public function waite($key, int $timeout = 5): bool
     {
@@ -187,7 +189,7 @@ SCRIPT;
 
     /**
      * @return \Redis
-     * @throws RedisConnectException
+     * @throws RedisConnectException|RedisException
      */
     protected function connect(): \Redis
     {