From d6db083deadfe84c3fc7144459c15f19b001767e Mon Sep 17 00:00:00 2001
From: Nikita Kiselev <kiselev2008@gmail.com>
Date: Mon, 17 Nov 2025 15:00:54 +0300
Subject: [PATCH] Implement PSR3 and PHP Monolog (#19)

* feat: install monolog composer lib
* feat: implement psr3 and monolog
* feat: display logs in frontend
* fix: tests
* build: update cicd to run tests for PR
* build: add phpcs to cicd
* refactor: fix phpcs problems
---
 .github/workflows/main.yaml                   |  21 ++
 Makefile                                      |   3 +
 frontend/admin/src/App.vue                    |   4 +
 frontend/admin/src/assets/main.css            |   4 -
 frontend/admin/src/components/LogsViewer.vue  |  18 ++
 frontend/admin/src/router/index.js            |   2 +
 frontend/admin/src/views/LogsView.vue         |   8 +
 .../controller/extension/module/tgshop.php    |  51 +++--
 .../template/extension/module/tgshop.twig     |  12 +-
 .../controller/extension/tgshop/handle.php    |  33 ++--
 .../bastion/Handlers/DictionariesHandler.php  |   0
 .../bastion/Handlers/LogsHandler.php          |  59 ++++++
 .../bastion/Handlers/TelegramHandler.php      |   8 +-
 .../bastion/Services/BotTokenConfigurator.php |   4 +-
 .../bastion/Tasks/CleanUpOldAssets.php        |   0
 .../oc_telegram_shop/bastion/routes.php       |   2 +
 .../upload/oc_telegram_shop/composer.json     |   7 +-
 .../upload/oc_telegram_shop/composer.lock     | 183 +++++++++++++++++-
 .../oc_telegram_shop/configs/maintenance.php  |   0
 .../database/migrations/.gitkeep              |   0
 ...101000000_migrate_from_legacy_settings.php |   0
 ...0101000001_create_telecart_cache_table.php |   0
 .../20260101000002_remove_legacy_files.php    |   0
 .../framework/Application.php                 |  22 +--
 .../framework/Container/Container.php         |   2 +
 .../framework/ErrorHandler.php                |   6 +-
 .../framework/Http/Request.php                |   2 +-
 .../framework/ImageTool/ImageTool.php         |   9 +-
 .../framework/Logger/Logger.php               |  89 ---------
 .../framework/Logger/LoggerInterface.php      |  25 ---
 .../framework/Logger/OpenCartLogAdapter.php   |  85 --------
 .../MaintenanceTasks/BaseMaintenanceTask.php  |   2 +-
 .../MaintenanceTaskInterface.php              |   0
 .../MaintenanceTasksService.php               |   2 +-
 .../MaintenanceTasksServiceProvider.php       |   2 +-
 .../framework/Migrations/Migration.php        |   2 +-
 .../Migrations/MigrationsServiceProvider.php  |   2 +-
 .../framework/Migrations/MigratorService.php  |  11 +-
 .../framework/Router/RouteServiceProvider.php |   2 +-
 .../framework/Support/Arr.php                 |   5 -
 .../framework/Support/Str.php                 |   1 -
 .../Support/SupportServiceProvider.php        |   0
 .../framework/Support/WorkLogsBag.php         |   0
 .../Telegram/Commands/StartCommand.php        |   2 +-
 .../framework/Telegram/RequestValidator.php   |   3 +-
 .../framework/Telegram/SignatureValidator.php |   2 +-
 .../Telegram/TelegramServiceProvider.php      |   2 +-
 .../TelegramValidateInitDataMiddleware.php    |   2 +-
 .../Validator/ValidatorInterface.php          |   2 +-
 .../src/Adapters/OcCartAdapter.php            |   3 +-
 .../src/DTO/Settings/MetricsDTO.php           |   1 -
 .../src/DTO/Settings/OrdersDTO.php            |   1 -
 .../src/DTO/Settings/StoreDTO.php             |   1 -
 .../src/DTO/Settings/TelegramDTO.php          |   1 -
 .../src/DTO/Settings/TextsDTO.php             |   1 -
 .../src/Exceptions/CustomExceptionHandler.php |   2 +-
 .../src/Handlers/ProductsHandler.php          |   2 +-
 .../src/Handlers/TelegramHandler.php          |   2 +-
 .../src/Services/BlocksService.php            |   2 +-
 .../src/Services/CartService.php              |  44 +++--
 .../src/Services/OrderCreateService.php       |   4 +-
 .../src/Services/ProductsService.php          |   4 +-
 .../Services/SettingsSerializerService.php    |  12 +-
 .../src/Telegram/LinkCommand.php              |   7 +-
 .../oc_telegram_shop/tests/TestCase.php       |  13 ++
 .../Unit/Framework/CriteriaBuilderTest.php    |   2 +
 66 files changed, 466 insertions(+), 337 deletions(-)
 create mode 100644 frontend/admin/src/components/LogsViewer.vue
 create mode 100644 frontend/admin/src/views/LogsView.vue
 mode change 100644 => 100755 module/oc_telegram_shop/upload/oc_telegram_shop/bastion/Handlers/DictionariesHandler.php
 create mode 100755 module/oc_telegram_shop/upload/oc_telegram_shop/bastion/Handlers/LogsHandler.php
 mode change 100644 => 100755 module/oc_telegram_shop/upload/oc_telegram_shop/bastion/Tasks/CleanUpOldAssets.php
 mode change 100644 => 100755 module/oc_telegram_shop/upload/oc_telegram_shop/configs/maintenance.php
 mode change 100644 => 100755 module/oc_telegram_shop/upload/oc_telegram_shop/database/migrations/.gitkeep
 mode change 100644 => 100755 module/oc_telegram_shop/upload/oc_telegram_shop/database/migrations/20260101000000_migrate_from_legacy_settings.php
 mode change 100644 => 100755 module/oc_telegram_shop/upload/oc_telegram_shop/database/migrations/20260101000001_create_telecart_cache_table.php
 mode change 100644 => 100755 module/oc_telegram_shop/upload/oc_telegram_shop/database/migrations/20260101000002_remove_legacy_files.php
 delete mode 100755 module/oc_telegram_shop/upload/oc_telegram_shop/framework/Logger/Logger.php
 delete mode 100755 module/oc_telegram_shop/upload/oc_telegram_shop/framework/Logger/LoggerInterface.php
 delete mode 100755 module/oc_telegram_shop/upload/oc_telegram_shop/framework/Logger/OpenCartLogAdapter.php
 mode change 100644 => 100755 module/oc_telegram_shop/upload/oc_telegram_shop/framework/MaintenanceTasks/BaseMaintenanceTask.php
 mode change 100644 => 100755 module/oc_telegram_shop/upload/oc_telegram_shop/framework/MaintenanceTasks/MaintenanceTaskInterface.php
 mode change 100644 => 100755 module/oc_telegram_shop/upload/oc_telegram_shop/framework/MaintenanceTasks/MaintenanceTasksService.php
 mode change 100644 => 100755 module/oc_telegram_shop/upload/oc_telegram_shop/framework/MaintenanceTasks/MaintenanceTasksServiceProvider.php
 mode change 100644 => 100755 module/oc_telegram_shop/upload/oc_telegram_shop/framework/Migrations/Migration.php
 mode change 100644 => 100755 module/oc_telegram_shop/upload/oc_telegram_shop/framework/Migrations/MigrationsServiceProvider.php
 mode change 100644 => 100755 module/oc_telegram_shop/upload/oc_telegram_shop/framework/Migrations/MigratorService.php
 mode change 100644 => 100755 module/oc_telegram_shop/upload/oc_telegram_shop/framework/Support/SupportServiceProvider.php
 mode change 100644 => 100755 module/oc_telegram_shop/upload/oc_telegram_shop/framework/Support/WorkLogsBag.php

diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
index 6b04b35..e2e1cdd 100644
--- a/.github/workflows/main.yaml
+++ b/.github/workflows/main.yaml
@@ -6,6 +6,11 @@ on:
       - master
       - 'issue/**'
       - develop
+  pull_request:
+    types:
+      - opened
+      - synchronize
+      - reopened
 
 permissions:
   contents: write
@@ -51,6 +56,22 @@ jobs:
           APP_ENV: testing
         run: ./vendor/bin/phpunit --testdox tests/Unit tests/Telegram
 
+  phpcs:
+    name: Run PHP_CodeSniffer
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Setup PHP 7.4
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: '7.4'
+          tools: phpcs
+
+      - name: Run PHP_CodeSniffer
+        working-directory: module/oc_telegram_shop/upload/oc_telegram_shop
+        run: phpcs --standard=PSR12 bastion framework src
+
   module-build:
     name: Build module.
     runs-on: ubuntu-latest
diff --git a/Makefile b/Makefile
index 26709a5..dd93338 100644
--- a/Makefile
+++ b/Makefile
@@ -46,6 +46,9 @@ dev-admin:
 lint:
 	docker compose exec -w /module/oc_telegram_shop/upload/oc_telegram_shop web bash -c "./vendor/bin/phpstan analyse src framework"
 
+phpcs:
+	docker compose exec -w /module/oc_telegram_shop/upload/oc_telegram_shop web bash -c "./vendor/bin/phpcs --standard=PSR12 bastion framework src"
+
 test:
 	docker compose exec -w /module/oc_telegram_shop/upload/oc_telegram_shop web bash -c "./vendor/bin/phpunit --testdox tests/"
 
diff --git a/frontend/admin/src/App.vue b/frontend/admin/src/App.vue
index 9776f3c..7983b1b 100644
--- a/frontend/admin/src/App.vue
+++ b/frontend/admin/src/App.vue
@@ -29,6 +29,10 @@
       <li :class="{active: route.name === 'mainpage'}">
         <RouterLink :to="{name: 'mainpage'}">Главная страница</RouterLink>
       </li>
+
+      <li :class="{active: route.name === 'logs'}">
+        <RouterLink :to="{name: 'logs'}">Журнал событий</RouterLink>
+      </li>
     </ul>
 
     <section class="form-horizontal tab-content">
diff --git a/frontend/admin/src/assets/main.css b/frontend/admin/src/assets/main.css
index 24a6b2c..8412c5b 100644
--- a/frontend/admin/src/assets/main.css
+++ b/frontend/admin/src/assets/main.css
@@ -1,9 +1,6 @@
 @layer theme, base, components, utilities;
 @import "tailwindcss/theme.css" layer(theme) prefix(tw);
 @import "tailwindcss/utilities.css" layer(utilities) prefix(tw);
-@plugin "daisyui" {
-    prefix: 'd-'
-}
 
 @layer components {
     .tw\:d-toggle {
@@ -24,7 +21,6 @@ html {
   font-size: 14px;
 }
 
-
 .p-toast .p-toast-message-success {
   color: #3c763d;
   background-color: #dff0d8;
diff --git a/frontend/admin/src/components/LogsViewer.vue b/frontend/admin/src/components/LogsViewer.vue
new file mode 100644
index 0000000..9966591
--- /dev/null
+++ b/frontend/admin/src/components/LogsViewer.vue
@@ -0,0 +1,18 @@
+<template>
+  <textarea v-text="rows" rows="40" class="tw:w-full"/>
+</template>
+
+<script setup>
+import {onMounted, ref} from "vue";
+import {apiGet} from "@/utils/http.js";
+
+const rows = ref('');
+onMounted(async () => {
+  const response = await apiGet('getLogs');
+  rows.value = response.data;
+});
+</script>
+
+<style scoped>
+
+</style>
diff --git a/frontend/admin/src/router/index.js b/frontend/admin/src/router/index.js
index e281564..a932ad3 100644
--- a/frontend/admin/src/router/index.js
+++ b/frontend/admin/src/router/index.js
@@ -6,6 +6,7 @@ import TelegramView from "@/views/TelegramView.vue";
 import MetricsView from "@/views/MetricsView.vue";
 import StoreView from "@/views/StoreView.vue";
 import MainPageView from "@/views/MainPageView.vue";
+import LogsView from "@/views/LogsView.vue";
 
 const router = createRouter({
   history: createMemoryHistory(),
@@ -17,6 +18,7 @@ const router = createRouter({
     {path: '/metrics', name: 'metrics', component: MetricsView},
     {path: '/store', name: 'store', component: StoreView},
     {path: '/mainpage', name: 'mainpage', component: MainPageView},
+    {path: '/logs', name: 'logs', component: LogsView},
   ],
 });
 
diff --git a/frontend/admin/src/views/LogsView.vue b/frontend/admin/src/views/LogsView.vue
new file mode 100644
index 0000000..bfa21f3
--- /dev/null
+++ b/frontend/admin/src/views/LogsView.vue
@@ -0,0 +1,8 @@
+<template>
+  <LogsViewer/>
+</template>
+
+<script setup>
+
+import LogsViewer from "@/components/LogsViewer.vue";
+</script>
diff --git a/module/oc_telegram_shop/upload/admin/controller/extension/module/tgshop.php b/module/oc_telegram_shop/upload/admin/controller/extension/module/tgshop.php
index 800c436..d4154cd 100755
--- a/module/oc_telegram_shop/upload/admin/controller/extension/module/tgshop.php
+++ b/module/oc_telegram_shop/upload/admin/controller/extension/module/tgshop.php
@@ -2,14 +2,15 @@
 
 use Bastion\ApplicationFactory;
 use Cart\User;
+use Monolog\Handler\StreamHandler;
+use Monolog\Logger;
 use Openguru\OpenCartFramework\Application;
 use Openguru\OpenCartFramework\Http\Response as HttpResponse;
 use Openguru\OpenCartFramework\ImageTool\ImageTool;
 use Openguru\OpenCartFramework\ImageTool\ImageToolInterface;
-use Openguru\OpenCartFramework\Logger\LoggerInterface;
-use Openguru\OpenCartFramework\Logger\OpenCartLogAdapter;
 use Openguru\OpenCartFramework\OpenCart\Decorators\OcRegistryDecorator;
 use Openguru\OpenCartFramework\Support\Arr;
+use Psr\Log\LoggerInterface;
 
 $sysLibPath = rtrim(DIR_SYSTEM, '/') . '/library/oc_telegram_shop';
 $basePath = rtrim(DIR_APPLICATION, '/') . '/..';
@@ -124,17 +125,18 @@ class ControllerExtensionModuleTgshop extends Controller
 
     public function handle(): void
     {
+        $logger = $this->createLogger();
+
         try {
             $this
-                ->createApplication()
+                ->createApplication($logger)
                 ->bootAndHandleRequest();
-        } catch (Exception $e) {
-            $logger = new OpenCartLogAdapter($this->log, 'TeleCart');
-            $logger->logException($e);
+        } catch (Throwable $e) {
+            $logger->error($e->getMessage(), ['exception' => $e]);
             http_response_code(HttpResponse::HTTP_INTERNAL_SERVER_ERROR);
             header('Content-Type: application/json');
             echo json_encode([
-                'error' => 'Server Error.',
+                'error' => getenv('APP_DEBUG') ? $e->getMessage() : 'Server Error.',
             ], JSON_THROW_ON_ERROR);
         }
     }
@@ -237,7 +239,7 @@ class ControllerExtensionModuleTgshop extends Controller
         }
     }
 
-    private function createApplication(): Application
+    private function createApplication(LoggerInterface $logger): Application
     {
         $json = $this->model_setting_setting->getSetting('module_telecart');
         if (! isset($json['module_telecart_settings'])) {
@@ -250,7 +252,7 @@ class ControllerExtensionModuleTgshop extends Controller
                 'language_id' => (int) $this->config->get('config_language_id'),
             ],
             'logs' => [
-                'path' => DIR_LOGS,
+                'path' => DIR_LOGS . '/telecart.log',
             ],
             'database' => [
                 'host' => DB_HOSTNAME,
@@ -276,21 +278,32 @@ class ControllerExtensionModuleTgshop extends Controller
         $app = ApplicationFactory::create($items);
         $app->bind(OcRegistryDecorator::class, fn() => new OcRegistryDecorator($this->registry));
         $app->bind(ImageToolInterface::class, fn() => new ImageTool(DIR_IMAGE, HTTPS_SERVER));
-
-        $app
-            ->withLogger(fn() => new OpenCartLogAdapter(
-                $this->log,
-                'TeleCartAdmin',
-                $app->getConfigValue('app.app_debug')
-                    ? LoggerInterface::LEVEL_DEBUG
-                    : LoggerInterface::LEVEL_INFO,
-            ));
+        $app->setLogger($logger);
 
         return $app;
     }
 
     private function runMaintenanceTasks(): void
     {
-        $this->createApplication()->runMaintenanceTasks();
+        $logger = $this->createLogger();
+
+        try {
+            $this->createApplication($logger)->runMaintenanceTasks();
+        } catch (Throwable $exception) {
+            $logger->error($exception->getMessage(), ['exception' => $exception]);
+        }
+    }
+
+    private function createLogger(bool $debug = false): Logger
+    {
+        $log = new Logger('TeleCart_Admin');
+        $log->pushHandler(
+            new StreamHandler(
+                DIR_LOGS . '/telecart.log',
+                $debug ? Logger::DEBUG : Logger::INFO,
+            )
+        );
+
+        return $log;
     }
 }
diff --git a/module/oc_telegram_shop/upload/admin/view/template/extension/module/tgshop.twig b/module/oc_telegram_shop/upload/admin/view/template/extension/module/tgshop.twig
index e559db2..53908ac 100755
--- a/module/oc_telegram_shop/upload/admin/view/template/extension/module/tgshop.twig
+++ b/module/oc_telegram_shop/upload/admin/view/template/extension/module/tgshop.twig
@@ -1,16 +1,6 @@
 {{ header }}{{ column_left }}
 <div id="content">
-    <div class="page-header">
-        <div class="container-fluid">
-            <h1>{{ heading_title }}</h1>
-            <ul class="breadcrumb">
-                {% for breadcrumb in breadcrumbs %}
-                    <li><a href="{{ breadcrumb.href }}">{{ breadcrumb.text }}</a></li>
-                {% endfor %}
-            </ul>
-        </div>
-    </div>
-    <div class="container-fluid">
+    <div class="container-fluid" style="margin-top: 10px;">
         {% if telecart_error_warning %}
             <div class="alert alert-danger alert-dismissible"><i
                         class="fa fa-exclamation-circle"></i> {{ telecart_error_warning }}
diff --git a/module/oc_telegram_shop/upload/catalog/controller/extension/tgshop/handle.php b/module/oc_telegram_shop/upload/catalog/controller/extension/tgshop/handle.php
index 44b4151..521a366 100755
--- a/module/oc_telegram_shop/upload/catalog/controller/extension/tgshop/handle.php
+++ b/module/oc_telegram_shop/upload/catalog/controller/extension/tgshop/handle.php
@@ -5,13 +5,14 @@ use App\ApplicationFactory;
 use Cart\Cart;
 use Cart\Currency;
 use Cart\Tax;
+use Monolog\Handler\StreamHandler;
+use Monolog\Logger;
 use Openguru\OpenCartFramework\Http\Response as HttpResponse;
 use Openguru\OpenCartFramework\ImageTool\ImageTool;
 use Openguru\OpenCartFramework\ImageTool\ImageToolInterface;
-use Openguru\OpenCartFramework\Logger\LoggerInterface;
-use Openguru\OpenCartFramework\Logger\OpenCartLogAdapter;
 use Openguru\OpenCartFramework\OpenCart\Decorators\OcRegistryDecorator;
 use Openguru\OpenCartFramework\Support\Arr;
+use Psr\Log\LoggerInterface;
 
 $sysLibPath = rtrim(DIR_SYSTEM, '/') . '/library/oc_telegram_shop';
 $basePath = rtrim(DIR_APPLICATION, '/') . '/..';
@@ -40,6 +41,8 @@ class ControllerExtensionTgshopHandle extends Controller
 
     public function index(): void
     {
+        $bootstrapLogger = $this->createLogger();
+
         try {
             $this->session->data['language'] = $this->config->get('config_language');
 
@@ -91,17 +94,10 @@ class ControllerExtensionTgshopHandle extends Controller
             $app->singleton(Log::class, fn() => $this->log);
 
             $app
-                ->withLogger(
-                    fn() => new OpenCartLogAdapter(
-                        $this->log,
-                        'TeleCart',
-                        $appDebug ? LoggerInterface::LEVEL_DEBUG : LoggerInterface::LEVEL_WARNING,
-                    )
-                )
+                ->withLogger(fn($app) => $this->createLogger($appDebug))
                 ->bootAndHandleRequest();
-        } catch (Exception $e) {
-            $logger = new OpenCartLogAdapter($this->log, 'TeleCart');
-            $logger->logException($e);
+        } catch (Throwable $e) {
+            $bootstrapLogger->error($e->getMessage(), ['exception' => $e]);
             http_response_code(HttpResponse::HTTP_INTERNAL_SERVER_ERROR);
             header('Content-Type: application/json');
             echo json_encode([
@@ -153,4 +149,17 @@ class ControllerExtensionTgshopHandle extends Controller
             http_response_code(404);
         }
     }
+
+    private function createLogger(bool $appDebug = false, string $app = 'TeleCart'): LoggerInterface
+    {
+        $log = new Logger($app);
+        $log->pushHandler(
+            new StreamHandler(
+                DIR_LOGS . '/telecart.log',
+                $appDebug ? Logger::DEBUG : Logger::INFO,
+            )
+        );
+
+        return $log;
+    }
 }
diff --git a/module/oc_telegram_shop/upload/oc_telegram_shop/bastion/Handlers/DictionariesHandler.php b/module/oc_telegram_shop/upload/oc_telegram_shop/bastion/Handlers/DictionariesHandler.php
old mode 100644
new mode 100755
diff --git a/module/oc_telegram_shop/upload/oc_telegram_shop/bastion/Handlers/LogsHandler.php b/module/oc_telegram_shop/upload/oc_telegram_shop/bastion/Handlers/LogsHandler.php
new file mode 100755
index 0000000..cd2224a
--- /dev/null
+++ b/module/oc_telegram_shop/upload/oc_telegram_shop/bastion/Handlers/LogsHandler.php
@@ -0,0 +1,59 @@
+<?php
+
+namespace Bastion\Handlers;
+
+use Openguru\OpenCartFramework\Config\Settings;
+use Openguru\OpenCartFramework\Http\JsonResponse;
+use Psr\Log\LoggerInterface;
+
+class LogsHandler
+{
+    private Settings $settings;
+    private LoggerInterface $logger;
+
+    public function __construct(Settings $settings, LoggerInterface $logger)
+    {
+        $this->settings = $settings;
+        $this->logger = $logger;
+    }
+
+    public function getLogs(): JsonResponse
+    {
+        $logsPath = $this->settings->get('logs.path');
+
+        $data = implode(PHP_EOL, $this->readLastLogsRows($logsPath));
+
+        return new JsonResponse(compact('data'));
+    }
+
+    private function readLastLogsRows(string $path, int $lines = 1000, int $buffer = 4096): array
+    {
+        $f = fopen($path, 'rb');
+        if (! $f) {
+            return [];
+        }
+
+        $lineCount = 0;
+        $chunk = '';
+
+        fseek($f, 0, SEEK_END);
+        $filesize = ftell($f);
+
+        while ($filesize > 0 && $lineCount < $lines) {
+            $seek = max($filesize - $buffer, 0);
+            $readLength = $filesize - $seek;
+
+            fseek($f, $seek);
+            $chunk = fread($f, $readLength) . $chunk;
+
+            $filesize = $seek;
+            $lineCount = substr_count($chunk, "\n");
+        }
+
+        fclose($f);
+
+        $linesArray = explode("\n", $chunk);
+
+        return array_reverse(array_slice($linesArray, -$lines));
+    }
+}
diff --git a/module/oc_telegram_shop/upload/oc_telegram_shop/bastion/Handlers/TelegramHandler.php b/module/oc_telegram_shop/upload/oc_telegram_shop/bastion/Handlers/TelegramHandler.php
index 5e51134..899ee9d 100755
--- a/module/oc_telegram_shop/upload/oc_telegram_shop/bastion/Handlers/TelegramHandler.php
+++ b/module/oc_telegram_shop/upload/oc_telegram_shop/bastion/Handlers/TelegramHandler.php
@@ -33,20 +33,24 @@ class TelegramHandler
 
         if (! $message) {
             return new JsonResponse([
+                // phpcs:ignore Generic.Files.LineLength
                 'message' => 'Сообщение не найдено. Убедитесь что отправили кодовое слово в чат с ботом и повторите через 10 секунд. У Вас есть 60 секунд после отправки сообщения в чат, чтобы нажать на кнопку! Это сделано в целях безопасности.'
             ], Response::HTTP_UNPROCESSABLE_ENTITY);
         }
 
         $text = Arr::get($message, 'text');
         if ($text !== 'opencart_get_chatid') {
-            return new JsonResponse(['message' => 'Последнее сообщение в чате не содержит кодовое слово.'],
-                Response::HTTP_UNPROCESSABLE_ENTITY);
+            return new JsonResponse(
+                ['message' => 'Последнее сообщение в чате не содержит кодовое слово.'],
+                Response::HTTP_UNPROCESSABLE_ENTITY
+            );
         }
 
         $chatId = Arr::get($message, 'chat.id');
 
         if (! $chatId) {
             return new JsonResponse([
+                // phpcs:ignore Generic.Files.LineLength
                 'message' => 'ChatID не найден. Убедитесь что отправили кодовое слово в чат с ботом и повторите через 10 секунд.'
             ], Response::HTTP_UNPROCESSABLE_ENTITY);
         }
diff --git a/module/oc_telegram_shop/upload/oc_telegram_shop/bastion/Services/BotTokenConfigurator.php b/module/oc_telegram_shop/upload/oc_telegram_shop/bastion/Services/BotTokenConfigurator.php
index 6592737..31220f7 100755
--- a/module/oc_telegram_shop/upload/oc_telegram_shop/bastion/Services/BotTokenConfigurator.php
+++ b/module/oc_telegram_shop/upload/oc_telegram_shop/bastion/Services/BotTokenConfigurator.php
@@ -8,7 +8,7 @@ use App\Services\SettingsService;
 use Bastion\Exceptions\BotTokenConfiguratorException;
 use Exception;
 use GuzzleHttp\Exception\GuzzleException;
-use Openguru\OpenCartFramework\Logger\LoggerInterface;
+use Psr\Log\LoggerInterface;
 use Openguru\OpenCartFramework\Router\Router;
 use Openguru\OpenCartFramework\Support\Arr;
 use Openguru\OpenCartFramework\Telegram\Exceptions\TelegramClientException;
@@ -66,7 +66,7 @@ class BotTokenConfigurator
             }
 
             throw new BotTokenConfiguratorException($exception->getMessage());
-        } catch (Exception|GuzzleException $exception) {
+        } catch (Exception | GuzzleException $exception) {
             $this->logger->logException($exception);
             throw new BotTokenConfiguratorException($exception->getMessage());
         }
diff --git a/module/oc_telegram_shop/upload/oc_telegram_shop/bastion/Tasks/CleanUpOldAssets.php b/module/oc_telegram_shop/upload/oc_telegram_shop/bastion/Tasks/CleanUpOldAssets.php
old mode 100644
new mode 100755
diff --git a/module/oc_telegram_shop/upload/oc_telegram_shop/bastion/routes.php b/module/oc_telegram_shop/upload/oc_telegram_shop/bastion/routes.php
index 39e4d29..a87a4b2 100755
--- a/module/oc_telegram_shop/upload/oc_telegram_shop/bastion/routes.php
+++ b/module/oc_telegram_shop/upload/oc_telegram_shop/bastion/routes.php
@@ -2,6 +2,7 @@
 
 use Bastion\Handlers\AutocompleteHandler;
 use Bastion\Handlers\DictionariesHandler;
+use Bastion\Handlers\LogsHandler;
 use Bastion\Handlers\SettingsHandler;
 use Bastion\Handlers\StatsHandler;
 use Bastion\Handlers\TelegramHandler;
@@ -22,4 +23,5 @@ return [
     'getAutocompleteCategories' => [AutocompleteHandler::class, 'getCategories'],
     'getAutocompleteCategoriesFlat' => [AutocompleteHandler::class, 'getCategoriesFlat'],
     'resetCache' => [SettingsHandler::class, 'resetCache'],
+    'getLogs' => [LogsHandler::class, 'getLogs'],
 ];
diff --git a/module/oc_telegram_shop/upload/oc_telegram_shop/composer.json b/module/oc_telegram_shop/upload/oc_telegram_shop/composer.json
index a0cf38f..9e1da4b 100755
--- a/module/oc_telegram_shop/upload/oc_telegram_shop/composer.json
+++ b/module/oc_telegram_shop/upload/oc_telegram_shop/composer.json
@@ -27,13 +27,16 @@
     "vlucas/phpdotenv": "^5.6",
     "guzzlehttp/guzzle": "^7.9",
     "symfony/cache": "^5.4",
-    "doctrine/dbal": "^3.10"
+    "doctrine/dbal": "^3.10",
+    "monolog/monolog": "^2.10",
+    "psr/log": "^1.1"
   },
   "require-dev": {
     "roave/security-advisories": "dev-latest",
     "phpstan/phpstan": "^2.1",
     "phpunit/phpunit": "^9.6",
     "doctrine/sql-formatter": "^1.3",
-    "mockery/mockery": "^1.6"
+    "mockery/mockery": "^1.6",
+    "squizlabs/php_codesniffer": "*"
   }
 }
diff --git a/module/oc_telegram_shop/upload/oc_telegram_shop/composer.lock b/module/oc_telegram_shop/upload/oc_telegram_shop/composer.lock
index b337288..712bfbc 100755
--- a/module/oc_telegram_shop/upload/oc_telegram_shop/composer.lock
+++ b/module/oc_telegram_shop/upload/oc_telegram_shop/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "3429e02a0f2458ebcd70b11ef4c3d0df",
+    "content-hash": "07f450f44362653c6a294138d35f325c",
     "packages": [
         {
             "name": "doctrine/dbal",
@@ -731,6 +731,108 @@
             ],
             "time": "2022-05-21T17:30:32+00:00"
         },
+        {
+            "name": "monolog/monolog",
+            "version": "2.10.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/Seldaek/monolog.git",
+                "reference": "5cf826f2991858b54d5c3809bee745560a1042a7"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/Seldaek/monolog/zipball/5cf826f2991858b54d5c3809bee745560a1042a7",
+                "reference": "5cf826f2991858b54d5c3809bee745560a1042a7",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.2",
+                "psr/log": "^1.0.1 || ^2.0 || ^3.0"
+            },
+            "provide": {
+                "psr/log-implementation": "1.0.0 || 2.0.0 || 3.0.0"
+            },
+            "require-dev": {
+                "aws/aws-sdk-php": "^2.4.9 || ^3.0",
+                "doctrine/couchdb": "~1.0@dev",
+                "elasticsearch/elasticsearch": "^7 || ^8",
+                "ext-json": "*",
+                "graylog2/gelf-php": "^1.4.2 || ^2@dev",
+                "guzzlehttp/guzzle": "^7.4",
+                "guzzlehttp/psr7": "^2.2",
+                "mongodb/mongodb": "^1.8",
+                "php-amqplib/php-amqplib": "~2.4 || ^3",
+                "phpspec/prophecy": "^1.15",
+                "phpstan/phpstan": "^1.10",
+                "phpunit/phpunit": "^8.5.38 || ^9.6.19",
+                "predis/predis": "^1.1 || ^2.0",
+                "rollbar/rollbar": "^1.3 || ^2 || ^3",
+                "ruflin/elastica": "^7",
+                "swiftmailer/swiftmailer": "^5.3|^6.0",
+                "symfony/mailer": "^5.4 || ^6",
+                "symfony/mime": "^5.4 || ^6"
+            },
+            "suggest": {
+                "aws/aws-sdk-php": "Allow sending log messages to AWS services like DynamoDB",
+                "doctrine/couchdb": "Allow sending log messages to a CouchDB server",
+                "elasticsearch/elasticsearch": "Allow sending log messages to an Elasticsearch server via official client",
+                "ext-amqp": "Allow sending log messages to an AMQP server (1.0+ required)",
+                "ext-curl": "Required to send log messages using the IFTTTHandler, the LogglyHandler, the SendGridHandler, the SlackWebhookHandler or the TelegramBotHandler",
+                "ext-mbstring": "Allow to work properly with unicode symbols",
+                "ext-mongodb": "Allow sending log messages to a MongoDB server (via driver)",
+                "ext-openssl": "Required to send log messages using SSL",
+                "ext-sockets": "Allow sending log messages to a Syslog server (via UDP driver)",
+                "graylog2/gelf-php": "Allow sending log messages to a GrayLog2 server",
+                "mongodb/mongodb": "Allow sending log messages to a MongoDB server (via library)",
+                "php-amqplib/php-amqplib": "Allow sending log messages to an AMQP server using php-amqplib",
+                "rollbar/rollbar": "Allow sending log messages to Rollbar",
+                "ruflin/elastica": "Allow sending log messages to an Elastic Search server"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-main": "2.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Monolog\\": "src/Monolog"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Jordi Boggiano",
+                    "email": "j.boggiano@seld.be",
+                    "homepage": "https://seld.be"
+                }
+            ],
+            "description": "Sends your logs to files, sockets, inboxes, databases and various web services",
+            "homepage": "https://github.com/Seldaek/monolog",
+            "keywords": [
+                "log",
+                "logging",
+                "psr-3"
+            ],
+            "support": {
+                "issues": "https://github.com/Seldaek/monolog/issues",
+                "source": "https://github.com/Seldaek/monolog/tree/2.10.0"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/Seldaek",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/monolog/monolog",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2024-11-12T12:43:37+00:00"
+        },
         {
             "name": "phpoption/phpoption",
             "version": "1.9.3",
@@ -4878,6 +4980,85 @@
             ],
             "time": "2020-09-28T06:39:44+00:00"
         },
+        {
+            "name": "squizlabs/php_codesniffer",
+            "version": "4.0.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/PHPCSStandards/PHP_CodeSniffer.git",
+                "reference": "0525c73950de35ded110cffafb9892946d7771b5"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/PHPCSStandards/PHP_CodeSniffer/zipball/0525c73950de35ded110cffafb9892946d7771b5",
+                "reference": "0525c73950de35ded110cffafb9892946d7771b5",
+                "shasum": ""
+            },
+            "require": {
+                "ext-simplexml": "*",
+                "ext-tokenizer": "*",
+                "ext-xmlwriter": "*",
+                "php": ">=7.2.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^8.4.0 || ^9.3.4 || ^10.5.32 || 11.3.3 - 11.5.28 || ^11.5.31"
+            },
+            "bin": [
+                "bin/phpcbf",
+                "bin/phpcs"
+            ],
+            "type": "library",
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Greg Sherwood",
+                    "role": "Former lead"
+                },
+                {
+                    "name": "Juliette Reinders Folmer",
+                    "role": "Current lead"
+                },
+                {
+                    "name": "Contributors",
+                    "homepage": "https://github.com/PHPCSStandards/PHP_CodeSniffer/graphs/contributors"
+                }
+            ],
+            "description": "PHP_CodeSniffer tokenizes PHP files and detects violations of a defined set of coding standards.",
+            "homepage": "https://github.com/PHPCSStandards/PHP_CodeSniffer",
+            "keywords": [
+                "phpcs",
+                "standards",
+                "static analysis"
+            ],
+            "support": {
+                "issues": "https://github.com/PHPCSStandards/PHP_CodeSniffer/issues",
+                "security": "https://github.com/PHPCSStandards/PHP_CodeSniffer/security/policy",
+                "source": "https://github.com/PHPCSStandards/PHP_CodeSniffer",
+                "wiki": "https://github.com/PHPCSStandards/PHP_CodeSniffer/wiki"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/PHPCSStandards",
+                    "type": "github"
+                },
+                {
+                    "url": "https://github.com/jrfnl",
+                    "type": "github"
+                },
+                {
+                    "url": "https://opencollective.com/php_codesniffer",
+                    "type": "open_collective"
+                },
+                {
+                    "url": "https://thanks.dev/u/gh/phpcsstandards",
+                    "type": "thanks_dev"
+                }
+            ],
+            "time": "2025-11-10T16:43:36+00:00"
+        },
         {
             "name": "theseer/tokenizer",
             "version": "1.2.3",
diff --git a/module/oc_telegram_shop/upload/oc_telegram_shop/configs/maintenance.php b/module/oc_telegram_shop/upload/oc_telegram_shop/configs/maintenance.php
old mode 100644
new mode 100755
diff --git a/module/oc_telegram_shop/upload/oc_telegram_shop/database/migrations/.gitkeep b/module/oc_telegram_shop/upload/oc_telegram_shop/database/migrations/.gitkeep
old mode 100644
new mode 100755
diff --git a/module/oc_telegram_shop/upload/oc_telegram_shop/database/migrations/20260101000000_migrate_from_legacy_settings.php b/module/oc_telegram_shop/upload/oc_telegram_shop/database/migrations/20260101000000_migrate_from_legacy_settings.php
old mode 100644
new mode 100755
diff --git a/module/oc_telegram_shop/upload/oc_telegram_shop/database/migrations/20260101000001_create_telecart_cache_table.php b/module/oc_telegram_shop/upload/oc_telegram_shop/database/migrations/20260101000001_create_telecart_cache_table.php
old mode 100644
new mode 100755
diff --git a/module/oc_telegram_shop/upload/oc_telegram_shop/database/migrations/20260101000002_remove_legacy_files.php b/module/oc_telegram_shop/upload/oc_telegram_shop/database/migrations/20260101000002_remove_legacy_files.php
old mode 100644
new mode 100755
diff --git a/module/oc_telegram_shop/upload/oc_telegram_shop/framework/Application.php b/module/oc_telegram_shop/upload/oc_telegram_shop/framework/Application.php
index 110f094..cefc42a 100755
--- a/module/oc_telegram_shop/upload/oc_telegram_shop/framework/Application.php
+++ b/module/oc_telegram_shop/upload/oc_telegram_shop/framework/Application.php
@@ -9,15 +9,15 @@ use Openguru\OpenCartFramework\Config\Settings;
 use Openguru\OpenCartFramework\Container\Container;
 use Openguru\OpenCartFramework\Http\JsonResponse;
 use Openguru\OpenCartFramework\Http\Request;
-use Openguru\OpenCartFramework\Logger\Logger;
-use Openguru\OpenCartFramework\Logger\LoggerInterface;
 use Openguru\OpenCartFramework\MaintenanceTasks\MaintenanceTasksService;
 use Openguru\OpenCartFramework\MaintenanceTasks\MaintenanceTasksServiceProvider;
 use Openguru\OpenCartFramework\Migrations\MigrationsServiceProvider;
 use Openguru\OpenCartFramework\Router\Router;
 use Openguru\OpenCartFramework\Support\ExecutionTimeProfiler;
+use Psr\Log\LoggerAwareInterface;
+use Psr\Log\LoggerInterface;
 
-class Application extends Container
+class Application extends Container implements LoggerAwareInterface
 {
     private static Application $instance;
     private static array $events = [];
@@ -27,15 +27,6 @@ class Application extends Container
 
     private LoggerInterface $logger;
 
-    public function __construct(array $config)
-    {
-        parent::__construct($config);
-
-        // Fallback logger
-        $path = rtrim($this->getConfigValue('logs.path'), '/') . '/oc_telegram_shop.log';
-        $this->logger = new Logger($path);
-    }
-
     /**
      * @var ExecutionTimeProfiler
      */
@@ -147,7 +138,7 @@ class Application extends Container
 
     public function withLogger(Closure $closure): Application
     {
-        $this->logger = $closure();
+        $this->setLogger($closure($this));
 
         return $this;
     }
@@ -175,4 +166,9 @@ class Application extends Container
 
         $this->get(MaintenanceTasksService::class)->run();
     }
+
+    public function setLogger(LoggerInterface $logger): void
+    {
+        $this->logger = $logger;
+    }
 }
diff --git a/module/oc_telegram_shop/upload/oc_telegram_shop/framework/Container/Container.php b/module/oc_telegram_shop/upload/oc_telegram_shop/framework/Container/Container.php
index a00d0c2..65a0524 100755
--- a/module/oc_telegram_shop/upload/oc_telegram_shop/framework/Container/Container.php
+++ b/module/oc_telegram_shop/upload/oc_telegram_shop/framework/Container/Container.php
@@ -14,10 +14,12 @@ use ReflectionMethod;
 use ReflectionNamedType;
 use RuntimeException;
 
+// phpcs:disable PSR1.Files.SideEffects
 if (! defined('BP_BASE_PATH')) {
     $phar = Phar::running(false);
     define('BP_BASE_PATH', $phar ? "phar://$phar" : dirname(__DIR__) . '/..');
 }
+// phpcs:enable PSR1.Files.SideEffects
 
 class Container implements ContainerInterface
 {
diff --git a/module/oc_telegram_shop/upload/oc_telegram_shop/framework/ErrorHandler.php b/module/oc_telegram_shop/upload/oc_telegram_shop/framework/ErrorHandler.php
index 5adf014..42a52c9 100755
--- a/module/oc_telegram_shop/upload/oc_telegram_shop/framework/ErrorHandler.php
+++ b/module/oc_telegram_shop/upload/oc_telegram_shop/framework/ErrorHandler.php
@@ -8,7 +8,7 @@ use Openguru\OpenCartFramework\Exceptions\ActionNotFoundException;
 use Openguru\OpenCartFramework\Exceptions\NonLoggableExceptionInterface;
 use Openguru\OpenCartFramework\Http\JsonResponse;
 use Openguru\OpenCartFramework\Http\Response;
-use Openguru\OpenCartFramework\Logger\LoggerInterface;
+use Psr\Log\LoggerInterface;
 use Throwable;
 
 /**
@@ -34,7 +34,7 @@ class ErrorHandler
 
     public function handleError(int $severity, string $message, string $file, int $line): bool
     {
-        if (($severity & E_DEPRECATED|E_USER_DEPRECATED)) {
+        if (($severity & E_DEPRECATED | E_USER_DEPRECATED)) {
             return true;
         }
 
@@ -61,7 +61,7 @@ class ErrorHandler
         }
 
         if (! $exception instanceof NonLoggableExceptionInterface) {
-            $this->logger->logException($exception);
+            $this->logger->error($exception->getMessage(), []);
         }
 
         if ($exception instanceof ActionNotFoundException) {
diff --git a/module/oc_telegram_shop/upload/oc_telegram_shop/framework/Http/Request.php b/module/oc_telegram_shop/upload/oc_telegram_shop/framework/Http/Request.php
index 5823255..5ca082d 100755
--- a/module/oc_telegram_shop/upload/oc_telegram_shop/framework/Http/Request.php
+++ b/module/oc_telegram_shop/upload/oc_telegram_shop/framework/Http/Request.php
@@ -99,7 +99,7 @@ final class Request
      */
     public function has($key): bool
     {
-         if (is_array($key)) {
+        if (is_array($key)) {
             foreach ($key as $k) {
                 if ($this->has($k)) {
                     return true;
diff --git a/module/oc_telegram_shop/upload/oc_telegram_shop/framework/ImageTool/ImageTool.php b/module/oc_telegram_shop/upload/oc_telegram_shop/framework/ImageTool/ImageTool.php
index b01771c..8b98e68 100755
--- a/module/oc_telegram_shop/upload/oc_telegram_shop/framework/ImageTool/ImageTool.php
+++ b/module/oc_telegram_shop/upload/oc_telegram_shop/framework/ImageTool/ImageTool.php
@@ -20,8 +20,13 @@ class ImageTool implements ImageToolInterface
         $this->manager = new ImageManager(['driver' => $driver]);
     }
 
-    public function resize(string $path, ?int $width = null, ?int $height = null, ?string $default = null, string $format = 'webp'): ?string
-    {
+    public function resize(
+        string $path,
+        ?int $width = null,
+        ?int $height = null,
+        ?string $default = null,
+        string $format = 'webp'
+    ): ?string {
         $filename = is_file($this->imageDir . $path) ? $path : $default;
 
         if (! $width && ! $height) {
diff --git a/module/oc_telegram_shop/upload/oc_telegram_shop/framework/Logger/Logger.php b/module/oc_telegram_shop/upload/oc_telegram_shop/framework/Logger/Logger.php
deleted file mode 100755
index ce9def4..0000000
--- a/module/oc_telegram_shop/upload/oc_telegram_shop/framework/Logger/Logger.php
+++ /dev/null
@@ -1,89 +0,0 @@
-<?php
-
-namespace Openguru\OpenCartFramework\Logger;
-
-use Throwable;
-
-class Logger implements LoggerInterface
-{
-    private $logFile;
-    private $logLevel;
-    private $maxFileSize; // Максимальный размер файла в байтах
-
-    public function __construct($logFile, $logLevel = LoggerInterface::LEVEL_INFO, $maxFileSize = 1048576)
-    {
-        $this->logFile = $logFile;
-        $this->logLevel = $logLevel;
-        $this->maxFileSize = $maxFileSize;
-    }
-
-    public function log($message, $level = LoggerInterface::LEVEL_INFO)
-    {
-        if ($level < $this->logLevel) {
-            return; // Не логируем, если уровень ниже установленного
-        }
-
-        $this->rotateLogs();
-
-        $timestamp = date('Y-m-d H:i:s');
-        $levelStr = $this->getLevelString($level);
-        $logMessage = "[$timestamp] [$levelStr] $message\n";
-
-        file_put_contents($this->logFile, $logMessage, FILE_APPEND);
-    }
-
-    private function getLevelString($level): string
-    {
-        switch ($level) {
-            case LoggerInterface::LEVEL_INFO:
-                return 'INFO';
-            case LoggerInterface::LEVEL_WARNING:
-                return 'WARNING';
-            case LoggerInterface::LEVEL_ERROR:
-                return 'ERROR';
-            default:
-                return 'UNKNOWN';
-        }
-    }
-
-    public function info(string $message): void
-    {
-        $this->log($message, LoggerInterface::LEVEL_INFO);
-    }
-
-    public function warning(string $message): void
-    {
-        $this->log($message, LoggerInterface::LEVEL_WARNING);
-    }
-
-    public function error(string $message): void
-    {
-        $this->log($message, LoggerInterface::LEVEL_ERROR);
-    }
-
-    private function rotateLogs(): void
-    {
-        if (is_file($this->logFile) && filesize($this->logFile) >= $this->maxFileSize) {
-            $newLogFile = $this->logFile . '.' . date('YmdHis');
-            rename($this->logFile, $newLogFile);
-        }
-    }
-
-    public function logException(Throwable $exception): void
-    {
-        $this->error(
-            sprintf(
-                "Fatal error %s in %s on line %d\n%s",
-                $exception->getMessage(),
-                $exception->getFile(),
-                $exception->getLine(),
-                $exception->getTraceAsString()
-            )
-        );
-    }
-
-    public function debug(string $message): void
-    {
-        $this->log($message, LoggerInterface::LEVEL_DEBUG);
-    }
-}
diff --git a/module/oc_telegram_shop/upload/oc_telegram_shop/framework/Logger/LoggerInterface.php b/module/oc_telegram_shop/upload/oc_telegram_shop/framework/Logger/LoggerInterface.php
deleted file mode 100755
index 2c1f1fa..0000000
--- a/module/oc_telegram_shop/upload/oc_telegram_shop/framework/Logger/LoggerInterface.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-
-namespace Openguru\OpenCartFramework\Logger;
-
-use Throwable;
-
-interface LoggerInterface
-{
-    public const LEVEL_DEBUG = 0;
-    public const LEVEL_INFO = 1;
-    public const LEVEL_WARNING = 2;
-    public const LEVEL_ERROR = 3;
-
-    public function log($message, $level = self::LEVEL_INFO);
-
-    public function debug(string $message): void;
-
-    public function info(string $message): void;
-
-    public function warning(string $message): void;
-
-    public function error(string $message): void;
-
-    public function logException(Throwable $exception): void;
-}
\ No newline at end of file
diff --git a/module/oc_telegram_shop/upload/oc_telegram_shop/framework/Logger/OpenCartLogAdapter.php b/module/oc_telegram_shop/upload/oc_telegram_shop/framework/Logger/OpenCartLogAdapter.php
deleted file mode 100755
index 3a6941b..0000000
--- a/module/oc_telegram_shop/upload/oc_telegram_shop/framework/Logger/OpenCartLogAdapter.php
+++ /dev/null
@@ -1,85 +0,0 @@
-<?php
-
-namespace Openguru\OpenCartFramework\Logger;
-
-use Log;
-use Throwable;
-
-class OpenCartLogAdapter implements LoggerInterface
-{
-    private Log $ocLogger;
-    private string $namespace;
-    private int $minLogLevel;
-
-    public function __construct(Log $ocLogger, string $namespace, int $minLogLevel = LoggerInterface::LEVEL_WARNING)
-    {
-        $this->ocLogger = $ocLogger;
-        $this->namespace = $namespace;
-        $this->minLogLevel = $minLogLevel;
-    }
-
-    public function log($message, $level = LoggerInterface::LEVEL_INFO): void
-    {
-        if ($level < $this->minLogLevel) {
-            return;
-        }
-
-        $this->ocLogger->write(
-            sprintf(
-                "[%s] [%s] %s\n",
-                $this->namespace,
-                $this->getLevelString($level),
-                $message
-            )
-        );
-    }
-
-    public function info(string $message): void
-    {
-        $this->log($message);
-    }
-
-    public function warning(string $message): void
-    {
-        $this->log($message, LoggerInterface::LEVEL_WARNING);
-    }
-
-    public function error(string $message): void
-    {
-        $this->log($message, LoggerInterface::LEVEL_ERROR);
-    }
-
-    public function logException(Throwable $exception): void
-    {
-        $this->error(
-            sprintf(
-                "Fatal error %s in %s on line %d\n%s",
-                $exception->getMessage(),
-                $exception->getFile(),
-                $exception->getLine(),
-                $exception->getTraceAsString()
-            )
-        );
-    }
-
-    private function getLevelString($level): string
-    {
-        switch ($level) {
-            case LoggerInterface::LEVEL_DEBUG:
-                return 'DEBUG';
-            case LoggerInterface::LEVEL_INFO:
-                return 'INFO';
-            case LoggerInterface::LEVEL_WARNING:
-                return 'WARNING';
-            case LoggerInterface::LEVEL_ERROR:
-                return 'ERROR';
-            default:
-                return 'UNKNOWN';
-        }
-    }
-
-    public function debug(string $message): void
-    {
-        $this->log($message, LoggerInterface::LEVEL_DEBUG);
-    }
-}
diff --git a/module/oc_telegram_shop/upload/oc_telegram_shop/framework/MaintenanceTasks/BaseMaintenanceTask.php b/module/oc_telegram_shop/upload/oc_telegram_shop/framework/MaintenanceTasks/BaseMaintenanceTask.php
old mode 100644
new mode 100755
index 53220d8..a2d8e58
--- a/module/oc_telegram_shop/upload/oc_telegram_shop/framework/MaintenanceTasks/BaseMaintenanceTask.php
+++ b/module/oc_telegram_shop/upload/oc_telegram_shop/framework/MaintenanceTasks/BaseMaintenanceTask.php
@@ -2,7 +2,7 @@
 
 namespace Openguru\OpenCartFramework\MaintenanceTasks;
 
-use Openguru\OpenCartFramework\Logger\LoggerInterface;
+use Psr\Log\LoggerInterface;
 
 abstract class BaseMaintenanceTask implements MaintenanceTaskInterface
 {
diff --git a/module/oc_telegram_shop/upload/oc_telegram_shop/framework/MaintenanceTasks/MaintenanceTaskInterface.php b/module/oc_telegram_shop/upload/oc_telegram_shop/framework/MaintenanceTasks/MaintenanceTaskInterface.php
old mode 100644
new mode 100755
diff --git a/module/oc_telegram_shop/upload/oc_telegram_shop/framework/MaintenanceTasks/MaintenanceTasksService.php b/module/oc_telegram_shop/upload/oc_telegram_shop/framework/MaintenanceTasks/MaintenanceTasksService.php
old mode 100644
new mode 100755
index ee2d35c..74c7511
--- a/module/oc_telegram_shop/upload/oc_telegram_shop/framework/MaintenanceTasks/MaintenanceTasksService.php
+++ b/module/oc_telegram_shop/upload/oc_telegram_shop/framework/MaintenanceTasks/MaintenanceTasksService.php
@@ -2,7 +2,7 @@
 
 namespace Openguru\OpenCartFramework\MaintenanceTasks;
 
-use Openguru\OpenCartFramework\Logger\LoggerInterface;
+use Psr\Log\LoggerInterface;
 use Openguru\OpenCartFramework\Migrations\MigratorService;
 
 class MaintenanceTasksService
diff --git a/module/oc_telegram_shop/upload/oc_telegram_shop/framework/MaintenanceTasks/MaintenanceTasksServiceProvider.php b/module/oc_telegram_shop/upload/oc_telegram_shop/framework/MaintenanceTasks/MaintenanceTasksServiceProvider.php
old mode 100644
new mode 100755
index 13b405f..9ec3707
--- a/module/oc_telegram_shop/upload/oc_telegram_shop/framework/MaintenanceTasks/MaintenanceTasksServiceProvider.php
+++ b/module/oc_telegram_shop/upload/oc_telegram_shop/framework/MaintenanceTasks/MaintenanceTasksServiceProvider.php
@@ -4,7 +4,7 @@ namespace Openguru\OpenCartFramework\MaintenanceTasks;
 
 use Openguru\OpenCartFramework\Container\Container;
 use Openguru\OpenCartFramework\Container\ServiceProvider;
-use Openguru\OpenCartFramework\Logger\LoggerInterface;
+use Psr\Log\LoggerInterface;
 use Openguru\OpenCartFramework\Migrations\MigratorService;
 
 class MaintenanceTasksServiceProvider extends ServiceProvider
diff --git a/module/oc_telegram_shop/upload/oc_telegram_shop/framework/Migrations/Migration.php b/module/oc_telegram_shop/upload/oc_telegram_shop/framework/Migrations/Migration.php
old mode 100644
new mode 100755
index e402d07..c066a83
--- a/module/oc_telegram_shop/upload/oc_telegram_shop/framework/Migrations/Migration.php
+++ b/module/oc_telegram_shop/upload/oc_telegram_shop/framework/Migrations/Migration.php
@@ -3,7 +3,7 @@
 namespace Openguru\OpenCartFramework\Migrations;
 
 use Openguru\OpenCartFramework\Application;
-use Openguru\OpenCartFramework\Logger\LoggerInterface;
+use Psr\Log\LoggerInterface;
 use Openguru\OpenCartFramework\QueryBuilder\Connections\ConnectionInterface;
 
 abstract class Migration
diff --git a/module/oc_telegram_shop/upload/oc_telegram_shop/framework/Migrations/MigrationsServiceProvider.php b/module/oc_telegram_shop/upload/oc_telegram_shop/framework/Migrations/MigrationsServiceProvider.php
old mode 100644
new mode 100755
index 27b904c..586b439
--- a/module/oc_telegram_shop/upload/oc_telegram_shop/framework/Migrations/MigrationsServiceProvider.php
+++ b/module/oc_telegram_shop/upload/oc_telegram_shop/framework/Migrations/MigrationsServiceProvider.php
@@ -4,7 +4,7 @@ namespace Openguru\OpenCartFramework\Migrations;
 
 use Openguru\OpenCartFramework\Container\Container;
 use Openguru\OpenCartFramework\Container\ServiceProvider;
-use Openguru\OpenCartFramework\Logger\LoggerInterface;
+use Psr\Log\LoggerInterface;
 use Openguru\OpenCartFramework\QueryBuilder\Connections\ConnectionInterface;
 use Openguru\OpenCartFramework\Support\WorkLogsBag;
 
diff --git a/module/oc_telegram_shop/upload/oc_telegram_shop/framework/Migrations/MigratorService.php b/module/oc_telegram_shop/upload/oc_telegram_shop/framework/Migrations/MigratorService.php
old mode 100644
new mode 100755
index 3783500..aa5c9cb
--- a/module/oc_telegram_shop/upload/oc_telegram_shop/framework/Migrations/MigratorService.php
+++ b/module/oc_telegram_shop/upload/oc_telegram_shop/framework/Migrations/MigratorService.php
@@ -3,8 +3,8 @@
 namespace Openguru\OpenCartFramework\Migrations;
 
 use Exception;
-use Openguru\OpenCartFramework\Logger\LoggerInterface;
 use Openguru\OpenCartFramework\QueryBuilder\Connections\ConnectionInterface;
+use Psr\Log\LoggerInterface;
 use RecursiveDirectoryIterator;
 use RecursiveIteratorIterator;
 use RuntimeException;
@@ -34,7 +34,7 @@ class MigratorService
         $count = $this->applyMigrations($migrationsToApply);
 
         if ($count > 0) {
-            $this->logger->log("$count migrations applied");
+            $this->logger->info("$count migrations applied");
         }
     }
 
@@ -52,7 +52,7 @@ class MigratorService
                 $this->createMigrationsTableSql()
             );
 
-            $this->logger->log('Migrations table created.');
+            $this->logger->info('Migrations table created.');
         }
     }
 
@@ -103,13 +103,12 @@ SQL;
 
                 $migration->up();
                 $this->writeMigration($file);
-                $this->logger->log("Migrated $file");
+                $this->logger->info("Migrated $file");
                 $count++;
                 $this->connection->commitTransaction();
             } catch (Exception $e) {
                 $this->connection->rollbackTransaction();
-                $this->logger->error("An error occurred while applying migration.");
-                $this->logger->logException($e);
+                $this->logger->error("An error occurred while applying migration.", ['exception' => $e]);
             }
         }
 
diff --git a/module/oc_telegram_shop/upload/oc_telegram_shop/framework/Router/RouteServiceProvider.php b/module/oc_telegram_shop/upload/oc_telegram_shop/framework/Router/RouteServiceProvider.php
index a61073b..cc6b7de 100755
--- a/module/oc_telegram_shop/upload/oc_telegram_shop/framework/Router/RouteServiceProvider.php
+++ b/module/oc_telegram_shop/upload/oc_telegram_shop/framework/Router/RouteServiceProvider.php
@@ -16,4 +16,4 @@ class RouteServiceProvider extends ServiceProvider
             return new Router($routes);
         });
     }
-}
\ No newline at end of file
+}
diff --git a/module/oc_telegram_shop/upload/oc_telegram_shop/framework/Support/Arr.php b/module/oc_telegram_shop/upload/oc_telegram_shop/framework/Support/Arr.php
index f394958..2dabba9 100755
--- a/module/oc_telegram_shop/upload/oc_telegram_shop/framework/Support/Arr.php
+++ b/module/oc_telegram_shop/upload/oc_telegram_shop/framework/Support/Arr.php
@@ -192,11 +192,6 @@ class Arr
      * @param array $array Исходный массив
      * @param array $keys Массив ключей в dot notation (например, ['app.name', 'app.logs.path', 'telegram.bot_token'])
      * @return array Отфильтрованный массив с сохранением структуры
-     *
-     * @example
-     * $array = ['app' => ['name' => 'MyApp', 'logs' => ['path' => '/var/log']], 'telegram' => ['bot_token' => 'token']];
-     * Arr::getWithKeys($array, ['app.name', 'app.logs.path', 'telegram.bot_token'])
-     * // Вернет: ['app' => ['name' => 'MyApp', 'logs' => ['path' => '/var/log']], 'telegram' => ['bot_token' => 'token']]
      */
     public static function getWithKeys(array $array, array $keys): array
     {
diff --git a/module/oc_telegram_shop/upload/oc_telegram_shop/framework/Support/Str.php b/module/oc_telegram_shop/upload/oc_telegram_shop/framework/Support/Str.php
index 981fda7..5121206 100755
--- a/module/oc_telegram_shop/upload/oc_telegram_shop/framework/Support/Str.php
+++ b/module/oc_telegram_shop/upload/oc_telegram_shop/framework/Support/Str.php
@@ -34,4 +34,3 @@ class Str
         return html_entity_decode($string, ENT_QUOTES | ENT_HTML5, 'UTF-8');
     }
 }
-
diff --git a/module/oc_telegram_shop/upload/oc_telegram_shop/framework/Support/SupportServiceProvider.php b/module/oc_telegram_shop/upload/oc_telegram_shop/framework/Support/SupportServiceProvider.php
old mode 100644
new mode 100755
diff --git a/module/oc_telegram_shop/upload/oc_telegram_shop/framework/Support/WorkLogsBag.php b/module/oc_telegram_shop/upload/oc_telegram_shop/framework/Support/WorkLogsBag.php
old mode 100644
new mode 100755
diff --git a/module/oc_telegram_shop/upload/oc_telegram_shop/framework/Telegram/Commands/StartCommand.php b/module/oc_telegram_shop/upload/oc_telegram_shop/framework/Telegram/Commands/StartCommand.php
index 83e653c..0b3146c 100755
--- a/module/oc_telegram_shop/upload/oc_telegram_shop/framework/Telegram/Commands/StartCommand.php
+++ b/module/oc_telegram_shop/upload/oc_telegram_shop/framework/Telegram/Commands/StartCommand.php
@@ -12,4 +12,4 @@ class StartCommand extends TelegramCommand
 
         $this->telegram->sendMessage($chatId, $message);
     }
-}
\ No newline at end of file
+}
diff --git a/module/oc_telegram_shop/upload/oc_telegram_shop/framework/Telegram/RequestValidator.php b/module/oc_telegram_shop/upload/oc_telegram_shop/framework/Telegram/RequestValidator.php
index c13fc96..2c77ce8 100755
--- a/module/oc_telegram_shop/upload/oc_telegram_shop/framework/Telegram/RequestValidator.php
+++ b/module/oc_telegram_shop/upload/oc_telegram_shop/framework/Telegram/RequestValidator.php
@@ -4,5 +4,4 @@ namespace Openguru\OpenCartFramework\Telegram;
 
 class RequestValidator
 {
-
-}
\ No newline at end of file
+}
diff --git a/module/oc_telegram_shop/upload/oc_telegram_shop/framework/Telegram/SignatureValidator.php b/module/oc_telegram_shop/upload/oc_telegram_shop/framework/Telegram/SignatureValidator.php
index 9f61588..48c1d4d 100755
--- a/module/oc_telegram_shop/upload/oc_telegram_shop/framework/Telegram/SignatureValidator.php
+++ b/module/oc_telegram_shop/upload/oc_telegram_shop/framework/Telegram/SignatureValidator.php
@@ -4,7 +4,7 @@ namespace Openguru\OpenCartFramework\Telegram;
 
 use App\Services\SettingsService;
 use Openguru\OpenCartFramework\Http\Request;
-use Openguru\OpenCartFramework\Logger\LoggerInterface;
+use Psr\Log\LoggerInterface;
 use Openguru\OpenCartFramework\Telegram\Exceptions\TelegramInvalidSignatureException;
 
 class SignatureValidator
diff --git a/module/oc_telegram_shop/upload/oc_telegram_shop/framework/Telegram/TelegramServiceProvider.php b/module/oc_telegram_shop/upload/oc_telegram_shop/framework/Telegram/TelegramServiceProvider.php
index 871bc2a..2da537a 100755
--- a/module/oc_telegram_shop/upload/oc_telegram_shop/framework/Telegram/TelegramServiceProvider.php
+++ b/module/oc_telegram_shop/upload/oc_telegram_shop/framework/Telegram/TelegramServiceProvider.php
@@ -5,7 +5,7 @@ namespace Openguru\OpenCartFramework\Telegram;
 use App\Services\SettingsService;
 use Openguru\OpenCartFramework\Application;
 use Openguru\OpenCartFramework\Container\ServiceProvider;
-use Openguru\OpenCartFramework\Logger\LoggerInterface;
+use Psr\Log\LoggerInterface;
 
 class TelegramServiceProvider extends ServiceProvider
 {
diff --git a/module/oc_telegram_shop/upload/oc_telegram_shop/framework/Telegram/TelegramValidateInitDataMiddleware.php b/module/oc_telegram_shop/upload/oc_telegram_shop/framework/Telegram/TelegramValidateInitDataMiddleware.php
index 8720a2e..57fd342 100755
--- a/module/oc_telegram_shop/upload/oc_telegram_shop/framework/Telegram/TelegramValidateInitDataMiddleware.php
+++ b/module/oc_telegram_shop/upload/oc_telegram_shop/framework/Telegram/TelegramValidateInitDataMiddleware.php
@@ -30,4 +30,4 @@ class TelegramValidateInitDataMiddleware
 
         return $next($request);
     }
-}
\ No newline at end of file
+}
diff --git a/module/oc_telegram_shop/upload/oc_telegram_shop/framework/Validator/ValidatorInterface.php b/module/oc_telegram_shop/upload/oc_telegram_shop/framework/Validator/ValidatorInterface.php
index a507276..2846678 100755
--- a/module/oc_telegram_shop/upload/oc_telegram_shop/framework/Validator/ValidatorInterface.php
+++ b/module/oc_telegram_shop/upload/oc_telegram_shop/framework/Validator/ValidatorInterface.php
@@ -12,4 +12,4 @@ interface ValidatorInterface
     public function fails(): bool;
 
     public function getErrors(): ErrorBag;
-}
\ No newline at end of file
+}
diff --git a/module/oc_telegram_shop/upload/oc_telegram_shop/src/Adapters/OcCartAdapter.php b/module/oc_telegram_shop/upload/oc_telegram_shop/src/Adapters/OcCartAdapter.php
index 5f85717..c51564a 100755
--- a/module/oc_telegram_shop/upload/oc_telegram_shop/src/Adapters/OcCartAdapter.php
+++ b/module/oc_telegram_shop/upload/oc_telegram_shop/src/Adapters/OcCartAdapter.php
@@ -4,5 +4,4 @@ namespace App\Adapters;
 
 class OcCartAdapter
 {
-
-}
\ No newline at end of file
+}
diff --git a/module/oc_telegram_shop/upload/oc_telegram_shop/src/DTO/Settings/MetricsDTO.php b/module/oc_telegram_shop/upload/oc_telegram_shop/src/DTO/Settings/MetricsDTO.php
index a166eb3..7b34891 100755
--- a/module/oc_telegram_shop/upload/oc_telegram_shop/src/DTO/Settings/MetricsDTO.php
+++ b/module/oc_telegram_shop/upload/oc_telegram_shop/src/DTO/Settings/MetricsDTO.php
@@ -33,4 +33,3 @@ final class MetricsDTO
         ];
     }
 }
-
diff --git a/module/oc_telegram_shop/upload/oc_telegram_shop/src/DTO/Settings/OrdersDTO.php b/module/oc_telegram_shop/upload/oc_telegram_shop/src/DTO/Settings/OrdersDTO.php
index e7b7b0d..8a55706 100755
--- a/module/oc_telegram_shop/upload/oc_telegram_shop/src/DTO/Settings/OrdersDTO.php
+++ b/module/oc_telegram_shop/upload/oc_telegram_shop/src/DTO/Settings/OrdersDTO.php
@@ -31,4 +31,3 @@ final class OrdersDTO
         ];
     }
 }
-
diff --git a/module/oc_telegram_shop/upload/oc_telegram_shop/src/DTO/Settings/StoreDTO.php b/module/oc_telegram_shop/upload/oc_telegram_shop/src/DTO/Settings/StoreDTO.php
index 083a9db..de25ef2 100755
--- a/module/oc_telegram_shop/upload/oc_telegram_shop/src/DTO/Settings/StoreDTO.php
+++ b/module/oc_telegram_shop/upload/oc_telegram_shop/src/DTO/Settings/StoreDTO.php
@@ -69,4 +69,3 @@ final class StoreDTO
         ];
     }
 }
-
diff --git a/module/oc_telegram_shop/upload/oc_telegram_shop/src/DTO/Settings/TelegramDTO.php b/module/oc_telegram_shop/upload/oc_telegram_shop/src/DTO/Settings/TelegramDTO.php
index 536bca9..1d568f0 100755
--- a/module/oc_telegram_shop/upload/oc_telegram_shop/src/DTO/Settings/TelegramDTO.php
+++ b/module/oc_telegram_shop/upload/oc_telegram_shop/src/DTO/Settings/TelegramDTO.php
@@ -60,4 +60,3 @@ final class TelegramDTO
         ];
     }
 }
-
diff --git a/module/oc_telegram_shop/upload/oc_telegram_shop/src/DTO/Settings/TextsDTO.php b/module/oc_telegram_shop/upload/oc_telegram_shop/src/DTO/Settings/TextsDTO.php
index ff7016a..cf78912 100755
--- a/module/oc_telegram_shop/upload/oc_telegram_shop/src/DTO/Settings/TextsDTO.php
+++ b/module/oc_telegram_shop/upload/oc_telegram_shop/src/DTO/Settings/TextsDTO.php
@@ -42,4 +42,3 @@ final class TextsDTO
         ];
     }
 }
-
diff --git a/module/oc_telegram_shop/upload/oc_telegram_shop/src/Exceptions/CustomExceptionHandler.php b/module/oc_telegram_shop/upload/oc_telegram_shop/src/Exceptions/CustomExceptionHandler.php
index b5d079b..a6213d5 100755
--- a/module/oc_telegram_shop/upload/oc_telegram_shop/src/Exceptions/CustomExceptionHandler.php
+++ b/module/oc_telegram_shop/upload/oc_telegram_shop/src/Exceptions/CustomExceptionHandler.php
@@ -18,4 +18,4 @@ class CustomExceptionHandler implements ExceptionHandlerInterface
 
         return null;
     }
-}
\ No newline at end of file
+}
diff --git a/module/oc_telegram_shop/upload/oc_telegram_shop/src/Handlers/ProductsHandler.php b/module/oc_telegram_shop/upload/oc_telegram_shop/src/Handlers/ProductsHandler.php
index 9d82cb6..8743d56 100755
--- a/module/oc_telegram_shop/upload/oc_telegram_shop/src/Handlers/ProductsHandler.php
+++ b/module/oc_telegram_shop/upload/oc_telegram_shop/src/Handlers/ProductsHandler.php
@@ -11,7 +11,7 @@ use Openguru\OpenCartFramework\Exceptions\EntityNotFoundException;
 use Openguru\OpenCartFramework\Http\JsonResponse;
 use Openguru\OpenCartFramework\Http\Request;
 use Openguru\OpenCartFramework\Http\Response;
-use Openguru\OpenCartFramework\Logger\LoggerInterface;
+use Psr\Log\LoggerInterface;
 use RuntimeException;
 
 class ProductsHandler
diff --git a/module/oc_telegram_shop/upload/oc_telegram_shop/src/Handlers/TelegramHandler.php b/module/oc_telegram_shop/upload/oc_telegram_shop/src/Handlers/TelegramHandler.php
index 1bd6f58..ae81c57 100755
--- a/module/oc_telegram_shop/upload/oc_telegram_shop/src/Handlers/TelegramHandler.php
+++ b/module/oc_telegram_shop/upload/oc_telegram_shop/src/Handlers/TelegramHandler.php
@@ -8,7 +8,7 @@ use Openguru\OpenCartFramework\Cache\CacheInterface;
 use Openguru\OpenCartFramework\Container\Container;
 use Openguru\OpenCartFramework\Http\JsonResponse;
 use Openguru\OpenCartFramework\Http\Request;
-use Openguru\OpenCartFramework\Logger\LoggerInterface;
+use Psr\Log\LoggerInterface;
 use Openguru\OpenCartFramework\Support\Arr;
 use Openguru\OpenCartFramework\Telegram\Contracts\TelegramCommandInterface;
 use Openguru\OpenCartFramework\Telegram\Exceptions\TelegramCommandNotFoundException;
diff --git a/module/oc_telegram_shop/upload/oc_telegram_shop/src/Services/BlocksService.php b/module/oc_telegram_shop/upload/oc_telegram_shop/src/Services/BlocksService.php
index 2154c19..1738d0f 100755
--- a/module/oc_telegram_shop/upload/oc_telegram_shop/src/Services/BlocksService.php
+++ b/module/oc_telegram_shop/upload/oc_telegram_shop/src/Services/BlocksService.php
@@ -4,7 +4,7 @@ namespace App\Services;
 
 use Openguru\OpenCartFramework\Cache\CacheInterface;
 use Openguru\OpenCartFramework\ImageTool\ImageToolInterface;
-use Openguru\OpenCartFramework\Logger\LoggerInterface;
+use Psr\Log\LoggerInterface;
 use Openguru\OpenCartFramework\QueryBuilder\Builder;
 use Openguru\OpenCartFramework\QueryBuilder\JoinClause;
 use RuntimeException;
diff --git a/module/oc_telegram_shop/upload/oc_telegram_shop/src/Services/CartService.php b/module/oc_telegram_shop/upload/oc_telegram_shop/src/Services/CartService.php
index ceaa697..a6139d3 100755
--- a/module/oc_telegram_shop/upload/oc_telegram_shop/src/Services/CartService.php
+++ b/module/oc_telegram_shop/upload/oc_telegram_shop/src/Services/CartService.php
@@ -21,9 +21,13 @@ class CartService
         $this->oc->load->language('checkout/cart');
 
         if ($this->oc->cart->hasProducts()) {
-            if (! $this->oc->cart->hasStock() && (! $this->oc->config->get('config_stock_checkout') || $this->oc->config->get(
-                        'config_stock_warning'
-                    ))) {
+            if (
+                ! $this->oc->cart->hasStock()
+                && (
+                    ! $this->oc->config->get('config_stock_checkout')
+                    || $this->oc->config->get('config_stock_warning')
+                )
+            ) {
                 $data['error_warning'] = $this->oc->language->get('error_stock');
             } elseif (isset($this->oc->session->data['error'])) {
                 $data['error_warning'] = $this->oc->session->data['error'];
@@ -154,19 +158,19 @@ class CartService
 
                     if ($product['recurring']['trial']) {
                         $recurring = sprintf(
-                                $this->oc->language->get('text_trial_description'),
-                                $this->oc->currency->format(
-                                    $this->oc->tax->calculate(
-                                        $product['recurring']['trial_price'] * $product['quantity'],
-                                        $product['tax_class_id'],
-                                        $this->oc->config->get('config_tax')
-                                    ),
-                                    $this->oc->session->data['currency']
+                            $this->oc->language->get('text_trial_description'),
+                            $this->oc->currency->format(
+                                $this->oc->tax->calculate(
+                                    $product['recurring']['trial_price'] * $product['quantity'],
+                                    $product['tax_class_id'],
+                                    $this->oc->config->get('config_tax')
                                 ),
-                                $product['recurring']['trial_cycle'],
-                                $frequencies[$product['recurring']['trial_frequency']],
-                                $product['recurring']['trial_duration']
-                            ) . ' ';
+                                $this->oc->session->data['currency']
+                            ),
+                            $product['recurring']['trial_cycle'],
+                            $frequencies[$product['recurring']['trial_frequency']],
+                            $product['recurring']['trial_duration']
+                        ) . ' ';
                     }
 
                     if ($product['recurring']['duration']) {
@@ -212,8 +216,8 @@ class CartService
                     'recurring' => $recurring,
                     'quantity' => (int) $product['quantity'],
                     'stock' => $product['stock'] ? true : ! (! $this->oc->config->get(
-                            'config_stock_checkout'
-                        ) || $this->oc->config->get('config_stock_warning')),
+                        'config_stock_checkout'
+                    ) || $this->oc->config->get('config_stock_warning')),
                     'reward' => ($product['reward'] ? sprintf(
                         $this->oc->language->get('text_points'),
                         $product['reward']
@@ -283,7 +287,9 @@ class CartService
 
             $lastTotal = $totals[count($totals) - 1] ?? false;
             $data['total'] = $lastTotal ? $lastTotal['value'] : 0;
-            $data['total_text'] = $lastTotal ? $this->oc->currency->format($lastTotal['value'], $this->oc->session->data['currency']) : 0;
+            $data['total_text'] = $lastTotal
+                ? $this->oc->currency->format($lastTotal['value'], $this->oc->session->data['currency'])
+                : 0;
             $data['total_products_count'] = $this->oc->cart->countProducts();
         } else {
             $data['text_error'] = $this->oc->language->get('text_empty');
@@ -302,4 +308,4 @@ class CartService
     {
         $this->cart->clear();
     }
-}
\ No newline at end of file
+}
diff --git a/module/oc_telegram_shop/upload/oc_telegram_shop/src/Services/OrderCreateService.php b/module/oc_telegram_shop/upload/oc_telegram_shop/src/Services/OrderCreateService.php
index aafe906..93861fc 100755
--- a/module/oc_telegram_shop/upload/oc_telegram_shop/src/Services/OrderCreateService.php
+++ b/module/oc_telegram_shop/upload/oc_telegram_shop/src/Services/OrderCreateService.php
@@ -7,7 +7,7 @@ namespace App\Services;
 use App\Exceptions\OrderValidationFailedException;
 use DateTime;
 use Exception;
-use Openguru\OpenCartFramework\Logger\LoggerInterface;
+use Psr\Log\LoggerInterface;
 use Openguru\OpenCartFramework\OpenCart\Decorators\OcRegistryDecorator;
 use Openguru\OpenCartFramework\QueryBuilder\Connections\ConnectionInterface;
 use Openguru\OpenCartFramework\Support\Arr;
@@ -268,4 +268,4 @@ class OrderCreateService
             'email' => 'email',
         ];
     }
-}
\ No newline at end of file
+}
diff --git a/module/oc_telegram_shop/upload/oc_telegram_shop/src/Services/ProductsService.php b/module/oc_telegram_shop/upload/oc_telegram_shop/src/Services/ProductsService.php
index 5ffc019..6d54b38 100755
--- a/module/oc_telegram_shop/upload/oc_telegram_shop/src/Services/ProductsService.php
+++ b/module/oc_telegram_shop/upload/oc_telegram_shop/src/Services/ProductsService.php
@@ -9,7 +9,7 @@ use Exception;
 use Openguru\OpenCartFramework\CriteriaBuilder\CriteriaBuilder;
 use Openguru\OpenCartFramework\Exceptions\EntityNotFoundException;
 use Openguru\OpenCartFramework\ImageTool\ImageToolInterface;
-use Openguru\OpenCartFramework\Logger\LoggerInterface;
+use Psr\Log\LoggerInterface;
 use Openguru\OpenCartFramework\OpenCart\Decorators\OcRegistryDecorator;
 use Openguru\OpenCartFramework\QueryBuilder\Builder;
 use Openguru\OpenCartFramework\QueryBuilder\JoinClause;
@@ -446,4 +446,4 @@ class ProductsService
             ->where('product_to_category.product_id', '=', $productId)
             ->firstOrNull();
     }
-}
\ No newline at end of file
+}
diff --git a/module/oc_telegram_shop/upload/oc_telegram_shop/src/Services/SettingsSerializerService.php b/module/oc_telegram_shop/upload/oc_telegram_shop/src/Services/SettingsSerializerService.php
index 1696a3e..2bc4583 100755
--- a/module/oc_telegram_shop/upload/oc_telegram_shop/src/Services/SettingsSerializerService.php
+++ b/module/oc_telegram_shop/upload/oc_telegram_shop/src/Services/SettingsSerializerService.php
@@ -231,15 +231,19 @@ class SettingsSerializerService
             throw new InvalidArgumentException('telegram.chat_id must be an integer or null');
         }
 
-        if (isset($data['owner_notification_template']) && ! is_string(
+        if (
+            isset($data['owner_notification_template']) && ! is_string(
                 $data['owner_notification_template']
-            )) {
+            )
+        ) {
             throw new InvalidArgumentException('telegram.owner_notification_template must be a string or null');
         }
 
-        if (isset($data['customer_notification_template']) && ! is_string(
+        if (
+            isset($data['customer_notification_template']) && ! is_string(
                 $data['customer_notification_template']
-            )) {
+            )
+        ) {
             throw new InvalidArgumentException('telegram.customer_notification_template must be a string or null');
         }
 
diff --git a/module/oc_telegram_shop/upload/oc_telegram_shop/src/Telegram/LinkCommand.php b/module/oc_telegram_shop/upload/oc_telegram_shop/src/Telegram/LinkCommand.php
index ef90cb5..e199c14 100755
--- a/module/oc_telegram_shop/upload/oc_telegram_shop/src/Telegram/LinkCommand.php
+++ b/module/oc_telegram_shop/upload/oc_telegram_shop/src/Telegram/LinkCommand.php
@@ -5,7 +5,7 @@ namespace App\Telegram;
 use GuzzleHttp\Exception\ClientException;
 use GuzzleHttp\Exception\GuzzleException;
 use JsonException;
-use Openguru\OpenCartFramework\Logger\LoggerInterface;
+use Psr\Log\LoggerInterface;
 use Openguru\OpenCartFramework\Support\Arr;
 use Openguru\OpenCartFramework\Telegram\Commands\TelegramCommand;
 use Openguru\OpenCartFramework\Telegram\Enums\ChatAction;
@@ -41,7 +41,8 @@ class LinkCommand extends TelegramCommand
             if (! $state) {
                 $greeting = $this->telegram->escapeTgSpecialCharacters(
                     <<<MARKDOWN
-Это удобный инструмент, который поможет вам 📎 создать красивое сообщение с кнопкой для открытия вашего 🛒 Telecart магазина.
+Это удобный инструмент, который поможет вам 📎 создать красивое 
+сообщение с кнопкой для открытия вашего 🛒 Telecart магазина.
 
 📌 Такое сообщение можно закрепить в канале или группе.  
 📤 Переслать клиентам в личные сообщения.  
@@ -145,4 +146,4 @@ MARKDOWN;
             $this->telegram->sendMessage($chatId, 'Произошла ошибка');
         }
     }
-}
\ No newline at end of file
+}
diff --git a/module/oc_telegram_shop/upload/oc_telegram_shop/tests/TestCase.php b/module/oc_telegram_shop/upload/oc_telegram_shop/tests/TestCase.php
index daa9d03..96b0004 100755
--- a/module/oc_telegram_shop/upload/oc_telegram_shop/tests/TestCase.php
+++ b/module/oc_telegram_shop/upload/oc_telegram_shop/tests/TestCase.php
@@ -4,9 +4,12 @@ namespace Tests;
 
 use App\ApplicationFactory;
 use Mockery;
+use Monolog\Handler\NullHandler;
+use Monolog\Logger;
 use Openguru\OpenCartFramework\Application;
 use Openguru\OpenCartFramework\Container\Container;
 use PHPUnit\Framework\TestCase as BaseTestCase;
+use Psr\Log\LoggerInterface;
 use Tests\Helpers\DatabaseHelpers;
 
 class TestCase extends BaseTestCase
@@ -63,6 +66,8 @@ class TestCase extends BaseTestCase
             ],
         ]);
 
+
+        $app->setLogger($this->getNullLogger());
         $app->boot();
 
         $this->registerDependenciesForTests($app);
@@ -90,4 +95,12 @@ class TestCase extends BaseTestCase
             return $url;
         });
     }
+
+    protected function getNullLogger(): LoggerInterface
+    {
+        $logger = new Logger('Telecart_Tests');
+        $logger->pushHandler(new NullHandler());
+
+        return $logger;
+    }
 }
diff --git a/module/oc_telegram_shop/upload/oc_telegram_shop/tests/Unit/Framework/CriteriaBuilderTest.php b/module/oc_telegram_shop/upload/oc_telegram_shop/tests/Unit/Framework/CriteriaBuilderTest.php
index ad860bc..7732578 100755
--- a/module/oc_telegram_shop/upload/oc_telegram_shop/tests/Unit/Framework/CriteriaBuilderTest.php
+++ b/module/oc_telegram_shop/upload/oc_telegram_shop/tests/Unit/Framework/CriteriaBuilderTest.php
@@ -14,6 +14,7 @@ use DirectoryIterator;
 use InvalidArgumentException;
 use JsonException;
 use Mockery;
+use Monolog\Logger;
 use Openguru\OpenCartFramework\Application;
 use Openguru\OpenCartFramework\Config\Settings;
 use Openguru\OpenCartFramework\Container\Container;
@@ -57,6 +58,7 @@ class CriteriaBuilderTest extends TestCase
         ];
         $config = Arr::mergeArraysRecursively($baseSettings, $settingsOverride);
         $application = new Application($config);
+        $application->setLogger($this->getNullLogger());
         $mysqlConnection = new MySqlConnection($this->getPdoMock());
         $application->boot();