From b263351289e84ebc1d9f8441368f48adf2dc8006 Mon Sep 17 00:00:00 2001
From: User <y_zuev@mail.ru>
Date: Sat, 19 Apr 2025 19:00:02 +0300
Subject: [PATCH] 20250419#1

---
 .env.dist                     | 2 +-
 composer.json                 | 4 ++--
 config/container.php          | 1 +
 config/container/params.php   | 6 ++++++
 config/container/services.php | 2 +-
 public/index.php              | 2 +-
 6 files changed, 12 insertions(+), 5 deletions(-)
 create mode 100644 config/container/params.php

diff --git a/.env.dist b/.env.dist
index 38f9352..48600ed 100644
--- a/.env.dist
+++ b/.env.dist
@@ -8,7 +8,7 @@
 #
 # Real environment variables win over .env files.
 
-# PROD / DEV
+# DEBUG / DEV / PROD
 APP_MODE=DEV
 APP_NODES_FILE=config/app.php
 CLI_NODES_FILE=config/app-cli.php
diff --git a/composer.json b/composer.json
index a5d5abe..145e413 100644
--- a/composer.json
+++ b/composer.json
@@ -5,7 +5,7 @@
 	"minimum-stability": "dev",
 	"prefer-stable" : true,
 	"require": {
-		"php": "^8.1",
+		"php": "^8.3",
 		"ext-json": "*",
 		"ext-yaml": "*",
 		"laminas/laminas-diactoros": "^2.5",
@@ -17,7 +17,7 @@
 		"rmphp/router": "^2.0",
 		"rmphp/session": "^1.1",
 		"rmphp/redis": "^1.0",
-		"rmphp/storage": "^9.0",
+		"rmphp/storage": "^10.0",
 		"symfony/dotenv": "^6.2"
 	},
     "autoload": {
diff --git a/config/container.php b/config/container.php
index f336b2e..292fef2 100644
--- a/config/container.php
+++ b/config/container.php
@@ -1,5 +1,6 @@
 <?php
 return [
+	"config/container/params.php",
 	"config/container/services.php",
 	"config/container/settings.php",
 ];
diff --git a/config/container/params.php b/config/container/params.php
new file mode 100644
index 0000000..a87b0b9
--- /dev/null
+++ b/config/container/params.php
@@ -0,0 +1,6 @@
+<?php
+
+return [
+	'MYSQL_PARAM' => json_decode(getenv("MYSQL_PARAM"), true),
+	'REDIS_PARAM' => json_decode(getenv("REDIS_PARAM"), true),
+];
diff --git a/config/container/services.php b/config/container/services.php
index 423330c..e9ea466 100644
--- a/config/container/services.php
+++ b/config/container/services.php
@@ -4,7 +4,7 @@ use Rmphp\Storage\Mysql\MysqlStorage;
 use Rmphp\Storage\Mysql\MysqlStorageInterface;
 
 return [
-	MysqlStorageInterface::class => DI\create(MysqlStorage::class)->constructor(json_decode(getenv("MYSQL_PARAM"))),
+	MysqlStorageInterface::class => DI\create(MysqlStorage::class)->constructor(DI\get("MYSQL_PARAM")),
 	'App\Domain\Repository\*RepositoryInterface' => DI\autowire('App\Infrastructure\Repository\*Repository'),
 	'App\*\Domain\Repository\*RepositoryInterface' => DI\autowire('App\*\Infrastructure\Repository\*Repository'),
 ];
diff --git a/public/index.php b/public/index.php
index 58cd6c7..4361760 100644
--- a/public/index.php
+++ b/public/index.php
@@ -23,7 +23,7 @@ $app = new App();
 $response = $app->handler($request, new Response());
 (new ResponseEmitter())->emit($response);
 
-if(($response->getStatusCode() !== 200 && getenv("APP_MODE") == 'DEV') || in_array("Dev", $response->getHeader("App-Mode"))){
+if(($response->getStatusCode() !== 200 && in_array(getenv("APP_MODE"), ['DEBUG', 'DEV'])) || in_array("Dev", $response->getHeader("App-Mode"))){
 	$app->syslogger()->dump("Response", $response);
 	addShutdownInfo($app->syslogger()->getLogs());
 }