eee

kiri-engine/Application.php

@@ -77,6 +77,10 @@ class Application extends BaseApplication
 			return;
 		}
 		$scanner = $this->container->get(Scanner::class);
+		$scanner->setConfig(array_merge(
+			config('servers.reload.scan', []),
+			config('site.scanner', [])
+		));
 		$scanner->scan(APP_PATH . 'app/');
     }
 

kiri-engine/Error/ErrorHandler.php

@@ -85,16 +85,23 @@ class ErrorHandler extends Component implements ErrorInterface
     public function shutdown(): void
     {
         $lastError = error_get_last();
-        if (empty($lastError) || $lastError['type'] !== E_ERROR) {
+        $fatalTypes = [E_ERROR, E_PARSE, E_CORE_ERROR, E_COMPILE_ERROR, E_USER_ERROR];
+        if (empty($lastError) || !in_array($lastError['type'], $fatalTypes, true)) {
             return;
         }
 
+        if (class_exists(\Kiri\Di\Scanner::class, false)) {
+            $scanFile = \Kiri\Di\Scanner::getCurrentFile();
+            if ($scanFile !== null) {
+                $lastError['scanner_file'] = $scanFile;
+            }
+        }
+
         $this->getLogger()->println(json_encode($lastError, JSON_UNESCAPED_UNICODE));
 
         event(new OnSystemError());
     }
 
-
     /**
      * @param Throwable $exception
      *