From 8a717f747bb49d980ee577f9e18d2e517beb271d Mon Sep 17 00:00:00 2001 From: Vladimir Fomichev Date: Wed, 28 Jan 2026 13:30:48 +0300 Subject: [PATCH] =?utf8?q?=D0=9F=D1=80=D0=B0=D0=B2=D0=BA=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- erp24/api2/config/dev.api2.config.php | 13 +------------ erp24/api2/config/env.php | 3 +++ .../tests/unit/commands/TEST_STARTS.md | 0 3 files changed, 4 insertions(+), 12 deletions(-) rename "erp24/tests/unit/commands/\320\227\320\220\320\237\320\243\320\241\320\232_\320\242\320\225\320\241\320\242\320\236\320\222.md" => erp24/tests/unit/commands/TEST_STARTS.md (100%) diff --git a/erp24/api2/config/dev.api2.config.php b/erp24/api2/config/dev.api2.config.php index 0e024d1f..fd057d89 100644 --- a/erp24/api2/config/dev.api2.config.php +++ b/erp24/api2/config/dev.api2.config.php @@ -46,18 +46,7 @@ return [ 'exchangeName' => 'telegram-exchange', ], // ВАЖНО для ERP24: Database credentials вынесены в переменные окружения (.env) - 'db' => [ - 'class' => yii\db\Connection::class, - 'dsn' => strtr('mysql:host={host};dbname={dbname}', [ - '{host}' => getenv('DB_HOST') ?: 'localhost', - '{dbname}' => getenv('DB_SCHEMA') ?: 'erp24', - ]), - 'username' => getenv('DB_USER') ?: '', - 'password' => getenv('DB_PASSWORD') ?: '', - 'charset' => 'utf8', - 'enableSchemaCache' => true, - 'schemaCacheDuration' => 300, - ], + 'db' => require __DIR__ . '/../../config/db.php', 'log' => [ 'traceLevel' => 3, 'targets' => [ diff --git a/erp24/api2/config/env.php b/erp24/api2/config/env.php index 19ba42f0..3a4c2aec 100644 --- a/erp24/api2/config/env.php +++ b/erp24/api2/config/env.php @@ -18,4 +18,7 @@ try { } catch (\Dotenv\Exception\InvalidPathException $e) { putenv("APP_ENV=development"); error_log('[ENV ERROR] Файл .env не найден: ' . $e->getMessage()); +} catch (\Dotenv\Exception\ValidationException $e) { + error_log('[ENV ERROR] Ошибка валидации .env: ' . $e->getMessage()); + throw $e; // Прекращаем выполнение при отсутствии обязательных переменных } diff --git "a/erp24/tests/unit/commands/\320\227\320\220\320\237\320\243\320\241\320\232_\320\242\320\225\320\241\320\242\320\236\320\222.md" b/erp24/tests/unit/commands/TEST_STARTS.md similarity index 100% rename from "erp24/tests/unit/commands/\320\227\320\220\320\237\320\243\320\241\320\232_\320\242\320\225\320\241\320\242\320\236\320\222.md" rename to erp24/tests/unit/commands/TEST_STARTS.md -- 2.39.5