From 84214468d2597eaaba267cf13e8c5ca3d8dfe365 Mon Sep 17 00:00:00 2001
From: Ivan Zorin <creator@localzet.com>
Date: Fri, 19 Apr 2024 18:36:06 +0300
Subject: [PATCH] Fix

---
 support/bootstrap.php | 13 ++++---------
 support/helpers.php   |  6 +++---
 2 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/support/bootstrap.php b/support/bootstrap.php
index 85370e4..db2232b 100644
--- a/support/bootstrap.php
+++ b/support/bootstrap.php
@@ -25,12 +25,13 @@
  *              For any questions, please contact <creator@localzet.com>
  */
 
-use Dotenv\Dotenv;
+use support\App;
 use support\Container;
 use support\Events;
 use support\Log;
 use Triangle\Engine\Bootstrap\BootstrapInterface;
 use Triangle\Engine\Config;
+use Triangle\Engine\Environment;
 use Triangle\Engine\Middleware;
 use Triangle\Engine\Router;
 
@@ -61,17 +62,11 @@ function ($start_time) {
 }
 
 // Загрузка переменных окружения из файла .env
-if (class_exists('Dotenv\Dotenv') && file_exists(base_path(false) . '/.env')) {
-    if (method_exists('Dotenv\Dotenv', 'createUnsafeMutable')) {
-        Dotenv::createUnsafeMutable(base_path(false))->load();
-    } else {
-        Dotenv::createMutable(base_path(false))->load();
-    }
-}
+Environment::load(run_path());
 
 // Очистка конфигурации
 Config::clear();
-support\App::loadAllConfig(['route']);
+App::loadAllConfig(['route']);
 
 // Установка часового пояса по умолчанию
 date_default_timezone_set(config('app.default_timezone', 'Europe/Moscow'));
diff --git a/support/helpers.php b/support/helpers.php
index c29c574..ddf8c33 100644
--- a/support/helpers.php
+++ b/support/helpers.php
@@ -28,11 +28,11 @@
 use localzet\Server\Connection\TcpConnection;
 use localzet\Server\Protocols\Http\Session;
 use support\Container;
-use support\Env;
 use support\Response;
 use support\Translation;
 use Triangle\Engine\App;
 use Triangle\Engine\Config;
+use Triangle\Engine\Environment;
 use Triangle\Engine\Http\Request;
 use Triangle\Engine\Router;
 use Triangle\Engine\View\Blade;
@@ -43,7 +43,7 @@
 use Twig\Error\RuntimeError;
 use Twig\Error\SyntaxError;
 
-define('BASE_PATH', dirname(__DIR__));
+define('BASE_PATH', str_contains(__DIR__, '/vendor/triangle/engine/') ? dirname(__DIR__, 5) : dirname(__DIR__));
 
 /** RESPONSE HELPERS */
 
@@ -460,7 +460,7 @@ function config(string $key = null, mixed $default = null): mixed
  */
 function env(string $key = null, mixed $default = null): mixed
 {
-    return Env::get($key, $default);
+    return Environment::get($key, $default);
 }
 
 /**