mirivlad
/
rss_agent_hub
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix database configuration to properly read .env variables

This commit is contained in:
Vladimir Mirivlad 2026-02-06 04:19:37 +00:00
parent 52820c7be7
commit 246d67315f
2 changed files with 32 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
app.php
View File

@ -25,6 +25,21 @@ if (file_exists(__DIR__ . '/vendor/autoload.php')) {
use App\MigrationRunner;
// Загрузка переменных окружения
if (file_exists(__DIR__ . '/.env')) {
$lines = file(__DIR__ . '/.env', FILE_IGNORE_NEW_LINES | FILE_SKIP_EMPTY_LINES);
foreach ($lines as $line) {
if (strpos($line, '=') !== false && strpos($line, '#') !== 0) {
list($key, $value) = explode('=', $line, 2);
$key = trim($key);
$value = trim($value);
if (!isset($_ENV[$key])) {
$_ENV[$key] = $value;
}
}
}
}
// Загрузка конфигурации БД
$config = require_once __DIR__ . '/config/database.php';

20
config/database.php
View File

@ -1,12 +1,26 @@
<?php
// Конфигурация базы данных для RSS Hub
// Загрузка переменных окружения, если файл .env существует
if (file_exists(__DIR__ . '/../.env')) {
$lines = file(__DIR__ . '/../.env', FILE_IGNORE_NEW_LINES | FILE_SKIP_EMPTY_LINES);
foreach ($lines as $line) {
if (strpos($line, '=') !== false && strpos($line, '#') !== 0) {
list($key, $value) = explode('=', $line, 2);
$key = trim($key);
$value = trim($value);
if (!isset($_ENV[$key])) {
$_ENV[$key] = $value;
}
}
}
}
return [
'host' => $_ENV['DB_HOST'] ?? 'localhost',
'database' => $_ENV['DB_NAME'] ?? 'rss_hub',
'username' => $_ENV['DB_USER'] ?? 'rss_hub_user',
'password' => $_ENV['DB_PASS'] ?? 'secure_password',
'database' => $_ENV['DB_NAME'] ?? 'rsshub',
'username' => $_ENV['DB_USER'] ?? 'rsshub',
'password' => $_ENV['DB_PASS'] ?? 'rsshub_moloko22',
'charset' => 'utf8mb4',
'collation' => 'utf8mb4_unicode_ci',
'options' => [