Update

Author: localzet

src/Autoload.php

@@ -33,25 +33,18 @@ class Autoload
 {
     public static function start(?string $arg = null, ?Server $server = null): void
     {
-        if (in_array($arg ?? '', ['start', 'restart', 'stop', 'status', 'reload', 'connections'])) {
-            // Предзагрузка
-            Config::reloadAll(['route', 'container']);
-            static::system();
-        } else if ($server instanceof Server) {
-            // При старте сервера
-            Config::reloadAll(['route']);
-            register_shutdown_function(fn($s): int|bool => (time() - $s <= 1) ? sleep(1) : true, time());
-            static::system();
-            static::files();
-            Bootstrap::start($server);
+        Config::reloadAll(['route']);
+        static::system();
+
+        if (($server instanceof Server)
+            || !in_array($arg ?? '', ['start', 'restart', 'stop', 'status', 'reload', 'connections'])
+        ) {
+            if ($server instanceof Server) {
+                register_shutdown_function(fn($s): int|bool => (time() - $s <= 0.1) ? sleep(1) : true, time());
+            }
             Context::init();
-        } else {
-            // CLI
-            Config::reloadAll(['route']);
-            set_error_handler(fn($l, $m, $f = '', $n = 0): bool => (error_reporting() & $l) ? throw new ErrorException($m, 0, $l, $f, $n) : true);
-            static::system();
             static::files();
-            Bootstrap::start();
+            Bootstrap::start($server);
         }
     }
 
@@ -60,6 +53,7 @@ private static function system(): void
         ini_set('display_errors', 'on');
         error_reporting(config('server.error_reporting', E_ALL));
         date_default_timezone_set(config('server.default_timezone', config('app.default_timezone', 'Europe/Moscow')));
+        set_error_handler(fn($l, $m, $f = '', $n = 0): bool => (error_reporting() & $l) ? throw new ErrorException($m, 0, $l, $f, $n) : true);
     }
 
     public static function files(): void

src/Context.php

@@ -32,7 +32,6 @@
 use localzet\Server\Events\Linux;
 use localzet\Server\Events\Swoole;
 use localzet\Server\Events\Swow;
-use SplObjectStorage;
 use StdClass;
 use WeakMap;
 use function property_exists;
@@ -46,7 +45,7 @@ class Context
 {
     protected static ?WeakMap $objectStorage = null;
 
-    protected static StdClass $object;
+    protected static ?StdClass $object = null;
 
     /**
      * Получить значение из контекста
@@ -63,7 +62,7 @@ public static function get(?string $key = null): mixed
     public static function init(): void
     {
         if (!(static::$objectStorage instanceof WeakMap)) {
-            static::$objectStorage = class_exists(WeakMap::class) ? new WeakMap() : new SplObjectStorage();
+            static::$objectStorage = new WeakMap();
             static::$object = new StdClass;
         }
     }
@@ -124,11 +123,27 @@ public static function has(string $key): bool
         return $key && ($obj = static::getObject()) && property_exists($obj, $key);
     }
 
+    /**
+     * @param $callback
+     * @return void
+     */
+    public static function onDestroy($callback): void
+    {
+        $obj = static::getObject();
+        $obj->destroyCallbacks[] = $callback;
+    }
+
     /**
      * Уничтожить контекст
      */
     public static function destroy(): void
     {
+        $obj = static::getObject();
+        if (isset($obj->destroyCallbacks)) {
+            foreach ($obj->destroyCallbacks as $callback) {
+                $callback();
+            }
+        }
         if ($key = static::getKey()) {
             unset(static::$objectStorage[$key]);
         }

src/Install/master

@@ -29,7 +29,7 @@ use Triangle\Engine\Autoload;
 use Triangle\Engine\Environment;
 use Triangle\Engine\Path;
 
-chdir(__DIR__);
+if (!Phar::running()) chdir(__DIR__);
 require_once __DIR__ . '/vendor/autoload.php';
 
 // Основная директория проекта