Added AttachmentNotReadyException (#19)

Silent mode for errors of unsupported event types #15

.github/workflows/ci.yml

@@ -30,7 +30,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        php-versions: [ "8.3", "8.4" ]
+        php-versions: [ "8.3", "8.4", "8.5" ]
     name: PHP ${{ matrix.php-versions }} Test on ubuntu-latest
 
     steps:
@@ -43,17 +43,6 @@ jobs:
           php-version: ${{ matrix.php-versions }}
           coverage: xdebug
 
-      - name: Get composer cache directory
-        id: composer-cache
-        run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
-
-      - name: Cache composer dependencies
-        uses: actions/cache@v3
-        with:
-          path: ${{ steps.composer-cache.outputs.dir }}
-          key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
-          restore-keys: ${{ runner.os }}-composer-
-
       - name: Install composer dependencies
         run: composer install --prefer-dist --no-interaction
 

composer.json

@@ -66,7 +66,7 @@
         }
     },
     "scripts": {
-        "analyse": "vendor/bin/phpstan analyse -c phpstan.neon --memory-limit=256M",
+        "analyse": "vendor/bin/phpstan analyse -c phpstan.neon --memory-limit=512M",
         "format": "vendor/bin/php-cs-fixer fix --allow-risky=yes src",
         "test": "vendor/bin/phpunit",
         "test-coverage": "vendor/bin/phpunit --coverage-html coverage",

docs/README.md

@@ -1,7 +1,6 @@
 - [Быстрый старт](#Быстрый-старт)
     - [Получение токена](#Получение-токена)
     - [Установка библиотеки](#Установка-библиотеки)
-    - [Установка библиотеки в Laravel](#Установка-библиотеки-в-Laravel)
     - [Инициализация бота](#Инициализация-бота)
 - [Информация о боте](#Информация-о-боте)
     - `GET /me` (`getBotInfo`) - [*Получение информации о боте.*](#Получение-информации-о-боте)
@@ -40,6 +39,18 @@
     - `GET /messages/{messageId}` (`getMessageById`) - [*Получение сообщения по ID.*](#Получение-сообщения-по-ID)
     - `GET /videos/{videoToken}` (`getVideoAttachmentDetails`) - [*Получение детальной информации о видео.*](#Получение-детальной-информации-о-видео)
     - `POST /answers` (`answerOnCallback`) - [*Ответ на нажатие callback-кнопки.*](#Ответ-на-нажатие-callback-кнопки)
+- [Laravel](#Laravel)
+    - [Регистрация пакета](#Регистрация-пакета)
+    - [Настройка](#Настройка)
+    - [Использование](#Использование)
+    - [Artisan команды](#Artisan-команды)
+        - [Подписка на Webhook](#Подписка-на-Webhook)
+        - [Удаление подписки](#Удаление-подписки)
+        - [Список подписок](#Список-подписок)
+    - [Обработка хуков](#Обработка-хуков)
+    - [Long Polling](#Long-Polling)
+    - [Handler Classes](#Handler-Classes)
+    - [Тестирование](#Тестирование)
 
 ## Быстрый старт
 
@@ -56,36 +67,6 @@
 composer require bushlanov-dev/max-bot-api-client-php
 ```
 
-### Установка библиотеки в Laravel
-
-Пользователи Laravel могут зарегистрировать сервис провайдер и фасад в `config/app.php`:
-
-```php
-'providers' => [
-    // ...
-    BushlanovDev\MaxMessengerBot\Laravel\MaxBotServiceProvider::class,
-],
-// ...
-'aliases' => [
-    // ...
-    'MaxBot' => BushlanovDev\MaxMessengerBot\Laravel\MaxBotFacade::class,
-],
-```
-
-При не необходимости опубликовать конфиг выполните следующую команду
-
-```bash
-php artisan vendor:publish --provider="BushlanovDev\MaxMessengerBot\Laravel\MaxBotServiceProvider"
-```
-
-Для работы вам потребуется внести следующие настройки в `.env`
-
-```env
-MAXBOT_ACCESS_TOKEN=your_bot_access_token_here
-MAXBOT_WEBHOOK_SECRET=your_webhook_secret_here
-MAXBOT_LOGGING_ENABLED=true
-```
-
 ### Инициализация бота
 
 Единственной обязательной настройкой является токен вашего бота.  
@@ -444,3 +425,192 @@ $api->answerOnCallback(
     notify: true,                      // Заполните это, если хотите просто отправить одноразовое уведомление пользователю (необязательно)
 );
 ```
+
+## Laravel
+
+### Регистрация пакета
+Пакет будет автоматически обнаружен Laravel.  
+Если автоматическое обнаружение отключено можно зарегистрировать сервис провайдер и фасад в `config/app.php`:
+
+```php
+'providers' => [
+    // ...
+    BushlanovDev\MaxMessengerBot\Laravel\MaxBotServiceProvider::class,
+],
+// ...
+'aliases' => [
+    // ...
+    'MaxBot' => BushlanovDev\MaxMessengerBot\Laravel\MaxBotFacade::class,
+],
+```
+### Настройка
+
+При не необходимости опубликовать конфиг выполните следующую команду:
+
+```bash
+php artisan vendor:publish --provider="BushlanovDev\MaxMessengerBot\Laravel\MaxBotServiceProvider"
+```
+
+Для работы вам потребуется добавить ваш токен в файл `.env`
+
+```env
+MAXBOT_ACCESS_TOKEN=your_bot_access_token_here
+MAXBOT_WEBHOOK_SECRET=your_webhook_secret_here
+```
+
+### Использование
+
+Все методы бота доступны через фасад MaxBot, например:
+
+```php
+use MaxBot;
+
+// Отправка сообщения пользователю
+MaxBot::sendUserMessage(123456, 'Hello from Laravel!');
+
+// Получение обновления
+$updates = MaxBot::getUpdates();
+```
+
+### Artisan команды
+
+#### Подписка на Webhook
+
+```bash
+# Подписка на получение обновлений
+php artisan maxbot:webhook:subscribe https://yourapp.com/bot/webhook
+
+# С верификацией
+php artisan maxbot:webhook:subscribe https://yourapp.com/bot/webhook --secret=your_secret_key
+
+# Подписка только на определенные типы событий
+php artisan maxbot:webhook:subscribe https://yourapp.com/bot/webhook --types=message_created --types=message_callback
+```
+
+#### Удаление подписки
+
+```bash
+php artisan maxbot:webhook:unsubscribe https://yourapp.com/bot/webhook
+```
+
+#### Список подписок
+
+```bash
+php artisan maxbot:webhook:list
+```
+
+### Обработка хуков
+
+Создайте контроллер для обработчика:
+
+```php
+use Illuminate\Http\Request;
+use BushlanovDev\MaxMessengerBot\Laravel\MaxBotManager;
+
+class WebhookController extends Controller
+{
+    public function handle(Request $request, MaxBotManager $botManager)
+    {
+        // Обработчик сообщений
+        $botManager->onMessageCreated(function (MessageCreatedUpdate $update) {
+            $message = $update->message;
+            // ...
+        });
+
+        // Обработчик команды /start
+        $botManager->onCommand('start', function (MessageCreatedUpdate $update) {
+            // ...
+        });
+
+        // Using Laravel container bindings
+        $botManager->onMessageCreated(MessageHandler::class);
+        $botManager->onCommand('help', HelpCommandHandler::class);
+
+        return $botManager->handleWebhook($request);
+    }
+}
+```
+
+Добавьте маршрут в  `routes/web.php`:
+
+```php
+Route::post('/bot/webhook', [WebhookController::class, 'handle']);
+```
+
+### Long Polling
+
+Создайте artisan команду для получения long polling обновлений:
+
+```php
+use Illuminate\Console\Command;
+use BushlanovDev\MaxMessengerBot\Laravel\MaxBotManager;
+
+class BotPollingCommand extends Command
+{
+    protected $signature = 'bot:polling';
+    
+    protected $description = 'Start bot long polling';
+
+    public function handle(MaxBotManager $botManager)
+    {
+        $this->info('Starting bot polling...');
+        $botManager->startLongPolling();
+    }
+}
+```
+
+### Handler Classes
+
+Примеры классов обработчиков обновлений:
+
+```php
+class MessageHandler
+{
+    public function handle(MessageCreatedUpdate $update)
+    {
+        $message = $update->message;
+        $text = $message->body?->text;
+        
+        if ($text) {
+            app(Api::class)->sendMessage(
+                userId: $message->sender->userId,
+                text: "You said: $text",
+            );
+        }
+    }
+}
+
+class HelpCommandHandler
+{
+    public function handle(MessageCreatedUpdate $update)
+    {
+        app(Api::class)->sendMessage(
+            userId: $update->message->sender->userId,
+            text: "This is help message",
+        );
+    }
+}
+```
+
+### Тестирование
+
+Вы можете использовать мок API для тестирования:
+
+```php
+use BushlanovDev\MaxMessengerBot\Api;
+
+class BotTest extends TestCase
+{
+    public function test_bot_sends_message()
+    {
+        $apiMock = $this->createMock(Api::class);
+        $apiMock->expects($this->once())
+            ->method('sendUserMessage')
+            ->with(123456, 'Hello!');
+
+        $this->app->instance(Api::class, $apiMock);
+
+        // Your test code here
+    }
+}
+```

phpunit.xml

@@ -1,14 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd"
-         bootstrap="vendor/autoload.php"
+         bootstrap="tests/bootstrap.php"
+         testdox="false"
          cacheDirectory=".phpunit.cache"
          executionOrder="depends,defects"
          requireCoverageMetadata="true"
          beStrictAboutCoverageMetadata="true"
          beStrictAboutOutputDuringTests="true"
-         displayDetailsOnPhpunitDeprecations="true"
-         failOnPhpunitDeprecation="true"
+         failOnDeprecation="false"
+         failOnPhpunitDeprecation="false"
+         displayDetailsOnPhpunitDeprecations="false"
+         displayDetailsOnTestsThatTriggerDeprecations="false"
+         displayDetailsOnTestsThatTriggerErrors="true"
+         displayDetailsOnTestsThatTriggerNotices="true"
+         displayDetailsOnTestsThatTriggerWarnings="true"
          failOnRisky="true"
          failOnWarning="true">
     <testsuites>
@@ -25,4 +31,8 @@
             <directory suffix=".php">src/Exceptions</directory>
         </exclude>
     </source>
+
+    <php>
+        <ini name="error_reporting" value="E_ALL &amp; ~E_DEPRECATED"/>
+    </php>
 </phpunit>

src/Api.php

@@ -48,11 +48,11 @@ use RuntimeException;
  */
 class Api
 {
-    public const string LIBRARY_VERSION = '1.2.1';
+    public const string LIBRARY_VERSION = '1.4.2';
 
-    public const string API_VERSION = '0.0.6';
+    public const string API_VERSION = '1.2.5';
 
-    private const string API_BASE_URL = 'https://botapi.max.ru';
+    private const string API_BASE_URL = 'https://platform-api.max.ru';
 
     private const string METHOD_GET = 'GET';
     private const string METHOD_POST = 'POST';
@@ -128,13 +128,13 @@ class Api
                 $httpFactory,
                 $httpFactory,
                 self::API_BASE_URL,
-                self::API_VERSION,
+                null,
                 $this->logger,
             );
         }
 
         $this->client = $client;
-        $this->modelFactory = $modelFactory ?? new ModelFactory();
+        $this->modelFactory = $modelFactory ?? new ModelFactory($this->logger);
         $this->updateDispatcher = new UpdateDispatcher($this);
     }
 
@@ -363,7 +363,7 @@ class Api
             $this->buildNewMessageBody($text, $attachments, $format, $link, $notify),
         );
 
-        return $this->modelFactory->createMessage($response['message']);
+        return $this->modelFactory->createMessageFromSendResponse($response);
     }
 
     /**
@@ -685,7 +685,6 @@ class Api
             return null;
         }
 
-
         return $this->modelFactory->createMessage($response['message']);
     }
 

src/Client.php

@@ -4,6 +4,7 @@ declare(strict_types=1);
 
 namespace BushlanovDev\MaxMessengerBot;
 
+use BushlanovDev\MaxMessengerBot\Exceptions\AttachmentNotReadyException;
 use BushlanovDev\MaxMessengerBot\Exceptions\ForbiddenException;
 use BushlanovDev\MaxMessengerBot\Exceptions\ClientApiException;
 use BushlanovDev\MaxMessengerBot\Exceptions\MethodNotAllowedException;
@@ -60,7 +61,6 @@ final readonly class Client implements ClientApiInterface
      */
     public function request(string $method, string $uri, array $queryParams = [], array $body = []): array
     {
-        $queryParams['access_token'] = $this->accessToken;
         if (!empty($this->apiVersion)) {
             $queryParams['v'] = $this->apiVersion;
         }
@@ -72,7 +72,9 @@ final readonly class Client implements ClientApiInterface
         ]);
 
         $fullUrl = $this->baseUrl . $uri . '?' . http_build_query($queryParams);
-        $request = $this->requestFactory->createRequest($method, $fullUrl);
+        $request = $this->requestFactory
+            ->createRequest($method, $fullUrl)
+            ->withHeader('Authorization', $this->accessToken);
 
         if (!empty($body)) {
             try {
@@ -143,6 +145,7 @@ final readonly class Client implements ClientApiInterface
         $request = $this->requestFactory
             ->createRequest('POST', $uri)
             ->withHeader('Content-Type', 'multipart/form-data; boundary=' . $boundary)
+            ->withHeader('Authorization', $this->accessToken)
             ->withBody($bodyStream);
 
         try {
@@ -198,7 +201,8 @@ final readonly class Client implements ClientApiInterface
                 ->withBody($chunkStream)
                 ->withHeader('Content-Type', 'application/octet-stream')
                 ->withHeader('Content-Disposition', 'attachment; filename="' . $fileName . '"')
-                ->withHeader('Content-Range', "bytes {$startByte}-{$endByte}/{$fileSize}");
+                ->withHeader('Content-Range', "bytes {$startByte}-{$endByte}/{$fileSize}")
+                ->withHeader('Authorization', $this->accessToken);
 
             try {
                 $response = $this->httpClient->sendRequest($request);
@@ -249,7 +253,27 @@ final readonly class Client implements ClientApiInterface
             404 => new NotFoundException($errorMessage, $errorCode, $response),
             405 => new MethodNotAllowedException($errorMessage, $errorCode, $response),
             429 => new RateLimitExceededException($errorMessage, $errorCode, $response),
-            default => new ClientApiException($errorMessage, $errorCode, $response, $statusCode),
+            default => $this->mapErrorCodeToException($errorMessage, $errorCode, $response, $statusCode),
+        };
+    }
+
+    /**
+     * @param string $message
+     * @param string $errorCode
+     * @param ResponseInterface $response
+     * @param int|null $httpStatusCode
+     *
+     * @return ClientApiException
+     */
+    private function mapErrorCodeToException(
+        string $message,
+        string $errorCode,
+        ResponseInterface $response,
+        ?int $httpStatusCode = null,
+    ): ClientApiException {
+        return match ($errorCode) {
+            'attachment.not.ready' => new AttachmentNotReadyException($message, $errorCode, $response, $httpStatusCode),
+            default => new ClientApiException($message, $errorCode, $response, $httpStatusCode),
         };
     }
 }

src/Enums/UpdateType.php

@@ -15,9 +15,14 @@ enum UpdateType: string
     case MessageRemoved = 'message_removed';
     case BotAdded = 'bot_added';
     case BotRemoved = 'bot_removed';
+    case DialogMuted = 'dialog_muted';
+    case DialogUnmuted = 'dialog_unmuted';
+    case DialogCleared = 'dialog_cleared';
+    case DialogRemoved = 'dialog_removed';
     case UserAdded = 'user_added';
     case UserRemoved = 'user_removed';
     case BotStarted = 'bot_started';
+    case BotStopped = 'bot_stopped';
     case ChatTitleChanged = 'chat_title_changed';
     case MessageChatCreated = 'message_chat_created';
 }

src/Exceptions/AttachmentNotReadyException.php

@@ -0,0 +1,13 @@
+<?php
+
+declare(strict_types=1);
+
+namespace BushlanovDev\MaxMessengerBot\Exceptions;
+
+/**
+ * Exception thrown when an attachment is not yet ready for use.
+ * This typically occurs when trying to use an attachment that is still being processed.
+ */
+class AttachmentNotReadyException extends ClientApiException
+{
+}

src/Laravel/MaxBotManager.php

@@ -27,7 +27,7 @@ use Throwable;
  * Provides convenient methods for integrating Max Bot with Laravel applications.
  * Handles webhook processing, long polling, and event dispatching within Laravel context.
  */
-class MaxBotManager
+readonly class MaxBotManager
 {
     /**
      * @param Container $container
@@ -35,9 +35,9 @@ class MaxBotManager
      * @param UpdateDispatcher $dispatcher
      */
     public function __construct(
-        private readonly Container $container,
-        private readonly Api $api,
-        private readonly UpdateDispatcher $dispatcher,
+        private Container $container,
+        private Api $api,
+        private UpdateDispatcher $dispatcher,
     ) {
     }
 
@@ -229,6 +229,58 @@ class MaxBotManager
         $this->dispatcher->onBotRemoved($this->resolveHandler($handler));
     }
 
+    /**
+     * Register a dialog mute handler.
+     *
+     * @param callable|string $handler Can be a closure, callable, or Laravel container binding.
+     *
+     * @throws BindingResolutionException
+     * @codeCoverageIgnore
+     */
+    public function onDialogMuted(callable|string $handler): void
+    {
+        $this->dispatcher->onDialogMuted($this->resolveHandler($handler));
+    }
+
+    /**
+     * Register a dialog unmute handler.
+     *
+     * @param callable|string $handler Can be a closure, callable, or Laravel container binding.
+     *
+     * @throws BindingResolutionException
+     * @codeCoverageIgnore
+     */
+    public function onDialogUnmuted(callable|string $handler): void
+    {
+        $this->dispatcher->onDialogUnmuted($this->resolveHandler($handler));
+    }
+
+    /**
+     * Register a dialog cleared handler.
+     *
+     * @param callable|string $handler Can be a closure, callable, or Laravel container binding.
+     *
+     * @throws BindingResolutionException
+     * @codeCoverageIgnore
+     */
+    public function onDialogCleared(callable|string $handler): void
+    {
+        $this->dispatcher->onDialogCleared($this->resolveHandler($handler));
+    }
+
+    /**
+     * Register a dialog removed handler.
+     *
+     * @param callable|string $handler Can be a closure, callable, or Laravel container binding.
+     *
+     * @throws BindingResolutionException
+     * @codeCoverageIgnore
+     */
+    public function onDialogRemoved(callable|string $handler): void
+    {
+        $this->dispatcher->onDialogRemoved($this->resolveHandler($handler));
+    }
+
     /**
      * Register a user added handler.
      *
@@ -268,6 +320,19 @@ class MaxBotManager
         $this->dispatcher->onBotStarted($this->resolveHandler($handler));
     }
 
+    /**
+     * Register a bot stopped handler.
+     *
+     * @param callable|string $handler Can be a closure, callable, or Laravel container binding.
+     *
+     * @throws BindingResolutionException
+     * @codeCoverageIgnore
+     */
+    public function onBotStopped(callable|string $handler): void
+    {
+        $this->dispatcher->onBotStopped($this->resolveHandler($handler));
+    }
+
     /**
      * Register a chat title changed handler.
      *

src/Laravel/MaxBotServiceProvider.php

@@ -76,14 +76,20 @@ class MaxBotServiceProvider extends ServiceProvider
                 $guzzle,
                 $httpFactory,
                 $httpFactory,
-                $config->get('maxbot.base_url', 'https://botapi.max.ru'),
-                $config->get('maxbot.api_version', Api::API_VERSION),
+                $config->get('maxbot.base_url', 'https://platform-api.max.ru'),
+                $config->get('maxbot.api_version'),
                 $logger,
             );
         });
 
-        $this->app->singleton(ModelFactory::class, function () {
-            return new ModelFactory();
+        $this->app->singleton(ModelFactory::class, function (Application $app) {
+            /** @var Config $config */
+            $config = $app->make(Config::class);
+            $logger = $config->get('maxbot.logging.enabled', false)
+                ? $app->make(LoggerInterface::class)
+                : new NullLogger();
+
+            return new ModelFactory($logger);
         });
 
         $this->app->singleton(Api::class, function (Application $app) {
@@ -97,11 +103,15 @@ class MaxBotServiceProvider extends ServiceProvider
                 );
             }
 
+            $logger = $config->get('maxbot.logging.enabled', false)
+                ? $app->make(LoggerInterface::class)
+                : new NullLogger();
+
             return new Api(
                 $accessToken,
                 $app->make(ClientApiInterface::class),
                 $app->make(ModelFactory::class),
-                $app->make(LoggerInterface::class),
+                $logger,
             );
         });
 
@@ -114,19 +124,30 @@ class MaxBotServiceProvider extends ServiceProvider
             $config = $app->make(Config::class);
             $secret = $config->get('maxbot.webhook_secret');
 
+            $logger = $config->get('maxbot.logging.enabled', false)
+                ? $app->make(LoggerInterface::class)
+                : new NullLogger();
+
             return new WebhookHandler(
                 $app->make(UpdateDispatcher::class),
                 $app->make(ModelFactory::class),
-                $app->make(LoggerInterface::class),
+                $logger,
                 $secret,
             );
         });
 
         $this->app->bind(LongPollingHandler::class, function (Application $app) {
+            /** @var Config $config */
+            $config = $app->make(Config::class);
+
+            $logger = $config->get('maxbot.logging.enabled', false)
+                ? $app->make(LoggerInterface::class)
+                : new NullLogger();
+
             return new LongPollingHandler(
                 $app->make(Api::class),
                 $app->make(UpdateDispatcher::class),
-                $app->make(LoggerInterface::class),
+                $logger,
             );
         });
 

src/ModelFactory.php

@@ -56,7 +56,12 @@ use BushlanovDev\MaxMessengerBot\Models\Updates\AbstractUpdate;
 use BushlanovDev\MaxMessengerBot\Models\Updates\BotAddedToChatUpdate;
 use BushlanovDev\MaxMessengerBot\Models\Updates\BotRemovedFromChatUpdate;
 use BushlanovDev\MaxMessengerBot\Models\Updates\BotStartedUpdate;
+use BushlanovDev\MaxMessengerBot\Models\Updates\BotStoppedUpdate;
 use BushlanovDev\MaxMessengerBot\Models\Updates\ChatTitleChangedUpdate;
+use BushlanovDev\MaxMessengerBot\Models\Updates\DialogClearedUpdate;
+use BushlanovDev\MaxMessengerBot\Models\Updates\DialogMutedUpdate;
+use BushlanovDev\MaxMessengerBot\Models\Updates\DialogRemovedUpdate;
+use BushlanovDev\MaxMessengerBot\Models\Updates\DialogUnmutedUpdate;
 use BushlanovDev\MaxMessengerBot\Models\Updates\MessageCallbackUpdate;
 use BushlanovDev\MaxMessengerBot\Models\Updates\MessageChatCreatedUpdate;
 use BushlanovDev\MaxMessengerBot\Models\Updates\MessageCreatedUpdate;
@@ -67,13 +72,25 @@ use BushlanovDev\MaxMessengerBot\Models\Updates\UserRemovedFromChatUpdate;
 use BushlanovDev\MaxMessengerBot\Models\UploadEndpoint;
 use BushlanovDev\MaxMessengerBot\Models\VideoAttachmentDetails;
 use LogicException;
+use Psr\Log\LoggerInterface;
+use Psr\Log\NullLogger;
 use ReflectionException;
 
 /**
  * Creates DTOs from raw associative arrays returned by the API client.
  */
-class ModelFactory
+readonly class ModelFactory
 {
+    private LoggerInterface $logger;
+
+    /**
+     * @param LoggerInterface|null $logger PSR LoggerInterface.
+     */
+    public function __construct(?LoggerInterface $logger = null)
+    {
+        $this->logger = $logger ?? new NullLogger();
+    }
+
     /**
      * Simple response to request.
      *
@@ -128,6 +145,33 @@ class ModelFactory
             : [];
     }
 
+    /**
+     * Creates a Message from the specific response structure of the sendMessage endpoint.
+     *
+     * @param array<string, mixed> $data The raw response from the client.
+     *
+     * @return Message
+     * @throws ReflectionException
+     */
+    public function createMessageFromSendResponse(array $data): Message
+    {
+        $messageData = $data['message'];
+
+        $topLevelData = [
+            'chat_id' => $data['chat_id'] ?? null,
+            'recipient_id' => $data['recipient_id'] ?? null,
+            'message_id' => $data['message_id'] ?? null,
+        ];
+        $messageData = array_merge($messageData, array_filter($topLevelData, fn($value) => $value !== null));
+
+        if (isset($messageData['message']) && is_array($messageData['message'])) {
+            $messageData['body'] = $messageData['message'];
+            unset($messageData['message']);
+        }
+
+        return $this->createMessage($messageData);
+    }
+
     /**
      * Message.
      *
@@ -267,7 +311,9 @@ class ModelFactory
             InlineButtonType::RequestGeoLocation => RequestGeoLocationButton::fromArray($data),
             InlineButtonType::Chat => ChatButton::fromArray($data),
             InlineButtonType::OpenApp => OpenAppButton::fromArray($data),
-            default => throw new LogicException('Unknown or unsupported inline button type: ' . ($data['type'] ?? 'none')),
+            default => throw new LogicException(
+                'Unknown or unsupported inline button type: ' . ($data['type'] ?? 'none')
+            ),
         };
     }
 
@@ -312,7 +358,11 @@ class ModelFactory
         if (isset($data['updates']) && is_array($data['updates'])) {
             foreach ($data['updates'] as $updateData) {
                 // Here we delegate the creation of a specific update to another factory method
-                $updateObjects[] = $this->createUpdate($updateData);
+                try {
+                    $updateObjects[] = $this->createUpdate($updateData);
+                } catch (LogicException $e) {
+                    $this->logger->debug($e->getMessage(), ['payload' => $updateData, 'exception' => $e]);
+                }
             }
         }
 
@@ -340,9 +390,14 @@ class ModelFactory
             UpdateType::MessageRemoved => MessageRemovedUpdate::fromArray($data),
             UpdateType::BotAdded => BotAddedToChatUpdate::fromArray($data),
             UpdateType::BotRemoved => BotRemovedFromChatUpdate::fromArray($data),
+            UpdateType::DialogMuted => DialogMutedUpdate::fromArray($data),
+            UpdateType::DialogUnmuted => DialogUnmutedUpdate::fromArray($data),
+            UpdateType::DialogCleared => DialogClearedUpdate::fromArray($data),
+            UpdateType::DialogRemoved => DialogRemovedUpdate::fromArray($data),
             UpdateType::UserAdded => UserAddedToChatUpdate::fromArray($data),
             UpdateType::UserRemoved => UserRemovedFromChatUpdate::fromArray($data),
             UpdateType::BotStarted => BotStartedUpdate::fromArray($data),
+            UpdateType::BotStopped => BotStoppedUpdate::fromArray($data),
             UpdateType::ChatTitleChanged => ChatTitleChangedUpdate::fromArray($data),
             UpdateType::MessageChatCreated => MessageChatCreatedUpdate::fromArray($data),
             default => throw new LogicException(

src/Models/Attachments/Payloads/PhotoAttachmentRequestPayload.php

@@ -23,9 +23,9 @@ final readonly class PhotoAttachmentRequestPayload extends AbstractAttachmentReq
         #[ArrayOf(PhotoToken::class)]
         public ?array $photos = null,
     ) {
-        if (count(array_filter([$this->url, $this->token, $this->photos])) !== 1) {
+        if ($this->url === null && $this->token === null && $this->photos === null) {
             throw new InvalidArgumentException(
-                'Provide exactly one of "url", "token", or "photos" for PhotoAttachmentRequestPayload.'
+                'Provide one of "url", "token", or "photos" for PhotoAttachmentRequestPayload.'
             );
         }
     }

src/Models/Attachments/Payloads/ShareAttachmentRequestPayload.php

@@ -19,9 +19,9 @@ final readonly class ShareAttachmentRequestPayload extends AbstractAttachmentReq
         public ?string $url = null,
         public ?string $token = null,
     ) {
-        if (count(array_filter([$this->url, $this->token])) !== 1) {
+        if ($this->url === null && $this->token === null) {
             throw new InvalidArgumentException(
-                'Provide exactly one of "url" or "token" for ShareAttachmentRequestPayload.'
+                'Provide one of "url" or "token" for ShareAttachmentRequestPayload.'
             );
         }
     }

src/Models/Message.php

@@ -17,6 +17,9 @@ final readonly class Message extends AbstractModel
      * @param string|null $url Message public URL. Can be null for dialogs or non-public chats/channels.
      * @param LinkedMessage|null $link Forwarded or replied message.
      * @param MessageStat|null $stat Message statistics. Available only for channels.
+     * @param int|null $chatId Chat identifier.
+     * @param int|null $recipientId User identifier, if message was sent to user.
+     * @param string|null $messageId Unique identifier of message.
      */
     public function __construct(
         public int $timestamp,
@@ -26,6 +29,9 @@ final readonly class Message extends AbstractModel
         public ?string $url,
         public ?LinkedMessage $link,
         public ?MessageStat $stat,
+        public ?int $chatId = null,
+        public ?int $recipientId = null,
+        public ?string $messageId = null,
     ) {
     }
 }

src/Models/Updates/BotStoppedUpdate.php

@@ -0,0 +1,29 @@
+<?php
+
+declare(strict_types=1);
+
+namespace BushlanovDev\MaxMessengerBot\Models\Updates;
+
+use BushlanovDev\MaxMessengerBot\Enums\UpdateType;
+use BushlanovDev\MaxMessengerBot\Models\User;
+
+/**
+ * The bot receives this type of update as soon as the user stops the bot.
+ */
+final readonly class BotStoppedUpdate extends AbstractUpdate
+{
+    /**
+     * @param int $timestamp Unix-time when event has occurred.
+     * @param int $chatId Dialog identifier where event has occurred.
+     * @param User $user User pressed the 'Start' button.
+     * @param string|null $userLocale Current user locale in IETF BCP 47 format.
+     */
+    public function __construct(
+        int $timestamp,
+        public int $chatId,
+        public User $user,
+        public ?string $userLocale,
+    ) {
+        parent::__construct(UpdateType::BotStopped, $timestamp);
+    }
+}

src/Models/Updates/DialogClearedUpdate.php

@@ -0,0 +1,29 @@
+<?php
+
+declare(strict_types=1);
+
+namespace BushlanovDev\MaxMessengerBot\Models\Updates;
+
+use BushlanovDev\MaxMessengerBot\Enums\UpdateType;
+use BushlanovDev\MaxMessengerBot\Models\User;
+
+/**
+ * Event clearing dialog history.
+ */
+final readonly class DialogClearedUpdate extends AbstractUpdate
+{
+    /**
+     * @param int $timestamp Unix-time when event has occurred.
+     * @param int $chatId Dialog identifier where event has occurred.
+     * @param User $user User pressed the 'Start' button.
+     * @param string|null $userLocale Current user locale in IETF BCP 47 format.
+     */
+    public function __construct(
+        int $timestamp,
+        public int $chatId,
+        public User $user,
+        public ?string $userLocale,
+    ) {
+        parent::__construct(UpdateType::DialogCleared, $timestamp);
+    }
+}

src/Models/Updates/DialogMutedUpdate.php

@@ -0,0 +1,31 @@
+<?php
+
+declare(strict_types=1);
+
+namespace BushlanovDev\MaxMessengerBot\Models\Updates;
+
+use BushlanovDev\MaxMessengerBot\Enums\UpdateType;
+use BushlanovDev\MaxMessengerBot\Models\User;
+
+/**
+ * Event when a user mutes a conversation with a bot.
+ */
+final readonly class DialogMutedUpdate extends AbstractUpdate
+{
+    /**
+     * @param int $timestamp Unix-time when event has occurred.
+     * @param int $chatId Dialog identifier where event has occurred.
+     * @param User $user User pressed the 'Start' button.
+     * @param int|null $mutedUntil The time in Unix format before which the dialog was disabled.
+     * @param string|null $userLocale Current user locale in IETF BCP 47 format.
+     */
+    public function __construct(
+        int $timestamp,
+        public int $chatId,
+        public User $user,
+        public ?int $mutedUntil,
+        public ?string $userLocale,
+    ) {
+        parent::__construct(UpdateType::DialogMuted, $timestamp);
+    }
+}

src/Models/Updates/DialogRemovedUpdate.php

@@ -0,0 +1,29 @@
+<?php
+
+declare(strict_types=1);
+
+namespace BushlanovDev\MaxMessengerBot\Models\Updates;
+
+use BushlanovDev\MaxMessengerBot\Enums\UpdateType;
+use BushlanovDev\MaxMessengerBot\Models\User;
+
+/**
+ * Event deleting a chat.
+ */
+final readonly class DialogRemovedUpdate extends AbstractUpdate
+{
+    /**
+     * @param int $timestamp Unix-time when event has occurred.
+     * @param int $chatId Dialog identifier where event has occurred.
+     * @param User $user User pressed the 'Start' button.
+     * @param string|null $userLocale Current user locale in IETF BCP 47 format.
+     */
+    public function __construct(
+        int $timestamp,
+        public int $chatId,
+        public User $user,
+        public ?string $userLocale,
+    ) {
+        parent::__construct(UpdateType::DialogRemoved, $timestamp);
+    }
+}

src/Models/Updates/DialogUnmutedUpdate.php

@@ -0,0 +1,29 @@
+<?php
+
+declare(strict_types=1);
+
+namespace BushlanovDev\MaxMessengerBot\Models\Updates;
+
+use BushlanovDev\MaxMessengerBot\Enums\UpdateType;
+use BushlanovDev\MaxMessengerBot\Models\User;
+
+/**
+ * Event of enabling notifications in a dialog.
+ */
+final readonly class DialogUnmutedUpdate extends AbstractUpdate
+{
+    /**
+     * @param int $timestamp Unix-time when event has occurred.
+     * @param int $chatId Dialog identifier where event has occurred.
+     * @param User $user User pressed the 'Start' button.
+     * @param string|null $userLocale Current user locale in IETF BCP 47 format.
+     */
+    public function __construct(
+        int $timestamp,
+        public int $chatId,
+        public User $user,
+        public ?string $userLocale,
+    ) {
+        parent::__construct(UpdateType::DialogUnmuted, $timestamp);
+    }
+}

src/UpdateDispatcher.php

@@ -164,6 +164,58 @@ final class UpdateDispatcher
         return $this->addHandler(UpdateType::BotRemoved, $handler);
     }
 
+    /**
+     * A convenient alias for addHandler(UpdateType::DialogMuted, $handler).
+     *
+     * @param callable(Models\Updates\DialogMutedUpdate, Api): void $handler
+     *
+     * @return $this
+     * @codeCoverageIgnore
+     */
+    public function onDialogMuted(callable $handler): self
+    {
+        return $this->addHandler(UpdateType::DialogMuted, $handler);
+    }
+
+    /**
+     * A convenient alias for addHandler(UpdateType::DialogUnmuted, $handler).
+     *
+     * @param callable(Models\Updates\DialogUnmutedUpdate, Api): void $handler
+     *
+     * @return $this
+     * @codeCoverageIgnore
+     */
+    public function onDialogUnmuted(callable $handler): self
+    {
+        return $this->addHandler(UpdateType::DialogUnmuted, $handler);
+    }
+
+    /**
+     * A convenient alias for addHandler(UpdateType::DialogCleared, $handler).
+     *
+     * @param callable(Models\Updates\DialogClearedUpdate, Api): void $handler
+     *
+     * @return $this
+     * @codeCoverageIgnore
+     */
+    public function onDialogCleared(callable $handler): self
+    {
+        return $this->addHandler(UpdateType::DialogCleared, $handler);
+    }
+
+    /**
+     * A convenient alias for addHandler(UpdateType::DialogRemoved, $handler).
+     *
+     * @param callable(Models\Updates\DialogRemovedUpdate, Api): void $handler
+     *
+     * @return $this
+     * @codeCoverageIgnore
+     */
+    public function onDialogRemoved(callable $handler): self
+    {
+        return $this->addHandler(UpdateType::DialogRemoved, $handler);
+    }
+
     /**
      * A convenient alias for addHandler(UpdateType::UserAdded, $handler).
      *
@@ -203,6 +255,19 @@ final class UpdateDispatcher
         return $this->addHandler(UpdateType::BotStarted, $handler);
     }
 
+    /**
+     * A convenient alias for addHandler(UpdateType::BotStopped, $handler).
+     *
+     * @param callable(Models\Updates\BotStoppedUpdate, Api): void $handler
+     *
+     * @return $this
+     * @codeCoverageIgnore
+     */
+    public function onBotStopped(callable $handler): self
+    {
+        return $this->addHandler(UpdateType::BotStopped, $handler);
+    }
+
     /**
      * A convenient alias for addHandler(UpdateType::ChatTitleChanged, $handler).
      *

src/WebhookHandler.php

@@ -69,9 +69,12 @@ final readonly class WebhookHandler
             throw new SerializationException('Failed to decode webhook body as JSON.', 0, $e);
         }
 
-        $update = $this->modelFactory->createUpdate($data);
-
-        $this->dispatcher->dispatch($update);
+        try {
+            $update = $this->modelFactory->createUpdate($data);
+            $this->dispatcher->dispatch($update);
+        } catch (\LogicException $e) {
+            $this->logger->debug($e->getMessage(), ['payload' => $payload, 'exception' => $e]);
+        }
 
         if (!headers_sent()) {
             http_response_code(200);

tests/ApiTest.php

@@ -118,6 +118,7 @@ use RuntimeException;
 #[UsesClass(VideoAttachmentDetails::class)]
 #[UsesClass(VideoUrls::class)]
 #[UsesClass(UpdateDispatcher::class)]
+#[UsesClass(ModelFactory::class)]
 final class ApiTest extends TestCase
 {
     use PHPMock;
@@ -336,7 +337,7 @@ final class ApiTest extends TestCase
         $apiResponse = [
             'message' => [
                 'timestamp' => time(),
-                'body' => ['mid' => 'mid.456.xyz', 'seq' => 101, 'text' => $text],
+                'message' => ['mid' => 'mid.456.xyz', 'seq' => 101, 'text' => $text],
                 'recipient' => ['chat_type' => 'dialog', 'user_id' => 123, 'chat_id' => null],
                 'sender' => [
                     'user_id' => 123,
@@ -348,9 +349,18 @@ final class ApiTest extends TestCase
                 ],
                 'url' => 'https://max.ru/message/123',
             ],
+            'chat_id' => 20414985,
+            'recipient_id' => 4328369,
+            'message_id' => 'mid.456.xyz',
         ];
 
-        $expectedMessageObject = Message::fromArray($apiResponse['message']);
+        $finalMessageData = $apiResponse['message'];
+        $finalMessageData['body'] = $finalMessageData['message'];
+        unset($finalMessageData['message']);
+        $finalMessageData['chat_id'] = $apiResponse['chat_id'];
+        $finalMessageData['recipient_id'] = $apiResponse['recipient_id'];
+        $finalMessageData['message_id'] = $apiResponse['message_id'];
+        $expectedMessageObject = Message::fromArray($finalMessageData);
 
         $this->clientMock
             ->expects($this->once())
@@ -360,8 +370,8 @@ final class ApiTest extends TestCase
 
         $this->modelFactoryMock
             ->expects($this->once())
-            ->method('createMessage')
-            ->with($apiResponse['message'])
+            ->method('createMessageFromSendResponse')
+            ->with($apiResponse)
             ->willReturn($expectedMessageObject);
 
         $result = $this->api->sendMessage(
@@ -416,12 +426,17 @@ final class ApiTest extends TestCase
         $apiResponse = [
             'message' => [
                 'timestamp' => time(),
-                'body' => ['mid' => 'mid.test.123', 'seq' => 1, 'text' => $text],
+                'message' => ['mid' => 'mid.test.123', 'seq' => 1, 'text' => $text],
                 'recipient' => ['chat_type' => 'dialog', 'user_id' => 123, 'chat_id' => null],
-            ]
+            ],
+            'message_id' => 'mid.test.123',
         ];
 
-        $expectedMessageObject = Message::fromArray($apiResponse['message']);
+        $finalMessageData = $apiResponse['message'];
+        $finalMessageData['body'] = $finalMessageData['message'];
+        unset($finalMessageData['message']);
+        $finalMessageData['message_id'] = $apiResponse['message_id'];
+        $expectedMessageObject = Message::fromArray($finalMessageData);
 
         $this->clientMock
             ->expects($this->once())
@@ -436,8 +451,8 @@ final class ApiTest extends TestCase
 
         $this->modelFactoryMock
             ->expects($this->once())
-            ->method('createMessage')
-            ->with($apiResponse['message'])
+            ->method('createMessageFromSendResponse')
+            ->with($apiResponse)
             ->willReturn($expectedMessageObject);
 
         $result = $this->api->sendMessage(
@@ -803,11 +818,15 @@ final class ApiTest extends TestCase
         $apiResponse = [
             'message' => [
                 'timestamp' => time(),
-                'body' => ['mid' => 'mid.sticker.1', 'seq' => 10],
+                'message' => ['mid' => 'mid.sticker.1', 'seq' => 10],
                 'recipient' => ['chat_type' => 'dialog', 'user_id' => $chatId],
             ]
         ];
-        $expectedMessageObject = Message::fromArray($apiResponse['message']);
+
+        $finalMessageData = $apiResponse['message'];
+        $finalMessageData['body'] = $finalMessageData['message'];
+        unset($finalMessageData['message']);
+        $expectedMessageObject = Message::fromArray($finalMessageData);
 
         $this->clientMock->expects($this->once())
             ->method('request')
@@ -815,8 +834,8 @@ final class ApiTest extends TestCase
             ->willReturn($apiResponse);
 
         $this->modelFactoryMock->expects($this->once())
-            ->method('createMessage')
-            ->with($apiResponse['message'])
+            ->method('createMessageFromSendResponse')
+            ->with($apiResponse)
             ->willReturn($expectedMessageObject);
 
         $result = $this->api->sendMessage(chatId: $chatId, attachments: [$stickerRequest]);
@@ -849,11 +868,14 @@ final class ApiTest extends TestCase
         $apiResponse = [
             'message' => [
                 'timestamp' => time(),
-                'body' => ['mid' => 'mid.contact.1', 'seq' => 11],
+                'message' => ['mid' => 'mid.contact.1', 'seq' => 11],
                 'recipient' => ['chat_type' => 'dialog', 'user_id' => $chatId],
             ]
         ];
-        $expectedMessageObject = Message::fromArray($apiResponse['message']);
+        $finalMessageData = $apiResponse['message'];
+        $finalMessageData['body'] = $finalMessageData['message'];
+        unset($finalMessageData['message']);
+        $expectedMessageObject = Message::fromArray($finalMessageData);
 
         $this->clientMock->expects($this->once())
             ->method('request')
@@ -861,8 +883,8 @@ final class ApiTest extends TestCase
             ->willReturn($apiResponse);
 
         $this->modelFactoryMock->expects($this->once())
-            ->method('createMessage')
-            ->with($apiResponse['message'])
+            ->method('createMessageFromSendResponse')
+            ->with($apiResponse)
             ->willReturn($expectedMessageObject);
 
         $result = $this->api->sendMessage(chatId: $chatId, attachments: [$contactRequest]);
@@ -895,11 +917,14 @@ final class ApiTest extends TestCase
         $apiResponse = [
             'message' => [
                 'timestamp' => time(),
-                'body' => ['mid' => 'mid.location.1', 'seq' => 12],
+                'message' => ['mid' => 'mid.location.1', 'seq' => 12],
                 'recipient' => ['chat_type' => 'dialog', 'user_id' => $chatId],
             ]
         ];
-        $expectedMessageObject = Message::fromArray($apiResponse['message']);
+        $finalMessageData = $apiResponse['message'];
+        $finalMessageData['body'] = $finalMessageData['message'];
+        unset($finalMessageData['message']);
+        $expectedMessageObject = Message::fromArray($finalMessageData);
 
         $this->clientMock->expects($this->once())
             ->method('request')
@@ -907,8 +932,8 @@ final class ApiTest extends TestCase
             ->willReturn($apiResponse);
 
         $this->modelFactoryMock->expects($this->once())
-            ->method('createMessage')
-            ->with($apiResponse['message'])
+            ->method('createMessageFromSendResponse')
+            ->with($apiResponse)
             ->willReturn($expectedMessageObject);
 
         $result = $this->api->sendMessage(chatId: $chatId, attachments: [$locationRequest]);
@@ -940,11 +965,14 @@ final class ApiTest extends TestCase
         $apiResponse = [
             'message' => [
                 'timestamp' => time(),
-                'body' => ['mid' => 'mid.share.1', 'seq' => 13],
+                'message' => ['mid' => 'mid.share.1', 'seq' => 13],
                 'recipient' => ['chat_type' => 'dialog', 'user_id' => $chatId],
             ]
         ];
-        $expectedMessageObject = Message::fromArray($apiResponse['message']);
+        $finalMessageData = $apiResponse['message'];
+        $finalMessageData['body'] = $finalMessageData['message'];
+        unset($finalMessageData['message']);
+        $expectedMessageObject = Message::fromArray($finalMessageData);
 
         $this->clientMock->expects($this->once())
             ->method('request')
@@ -952,8 +980,8 @@ final class ApiTest extends TestCase
             ->willReturn($apiResponse);
 
         $this->modelFactoryMock->expects($this->once())
-            ->method('createMessage')
-            ->with($apiResponse['message'])
+            ->method('createMessageFromSendResponse')
+            ->with($apiResponse)
             ->willReturn($expectedMessageObject);
 
         $result = $this->api->sendMessage(chatId: $chatId, attachments: [$shareRequest]);

tests/ClientTest.php

@@ -5,6 +5,7 @@ declare(strict_types=1);
 namespace BushlanovDev\MaxMessengerBot\Tests;
 
 use BushlanovDev\MaxMessengerBot\Client;
+use BushlanovDev\MaxMessengerBot\Exceptions\AttachmentNotReadyException;
 use BushlanovDev\MaxMessengerBot\Exceptions\ClientApiException;
 use BushlanovDev\MaxMessengerBot\Exceptions\ForbiddenException;
 use BushlanovDev\MaxMessengerBot\Exceptions\MethodNotAllowedException;
@@ -35,7 +36,7 @@ final class ClientTest extends TestCase
 {
     private const string FAKE_TOKEN = '12345:abcdef';
     private const string API_VERSION = '0.0.6';
-    private const string API_BASE_URL = 'https://botapi.max.ru';
+    private const string API_BASE_URL = 'https://platform-api.max.ru';
 
     private MockObject&ClientInterface $httpClientMock;
     private MockObject&RequestFactoryInterface $requestFactoryMock;
@@ -96,7 +97,6 @@ final class ClientTest extends TestCase
     {
         $uri = '/me';
         $expectedUrl = self::API_BASE_URL . $uri . '?' . http_build_query([
-                'access_token' => self::FAKE_TOKEN,
                 'v' => self::API_VERSION,
             ]);
         $responsePayload = ['id' => 987, 'name' => 'TestBot'];
@@ -108,6 +108,12 @@ final class ClientTest extends TestCase
             ->with('GET', $expectedUrl)
             ->willReturn($this->requestMock);
 
+        $this->requestMock
+            ->expects($this->once())
+            ->method('withHeader')
+            ->with('Authorization', self::FAKE_TOKEN)
+            ->willReturn($this->requestMock);
+
         $this->httpClientMock
             ->expects($this->once())
             ->method('sendRequest')
@@ -138,8 +144,7 @@ final class ClientTest extends TestCase
         ];
         $responsePayload = ['success' => true];
         $expectedUrl = self::API_BASE_URL . $uri . '?' . http_build_query([
-                'access_token' => self::FAKE_TOKEN,
-                'v' => self::API_VERSION
+                'v' => self::API_VERSION,
             ]);
 
         $this->requestFactoryMock
@@ -157,11 +162,23 @@ final class ClientTest extends TestCase
             }))
             ->willReturn($this->requestMock);
 
+        $headerCallCount = 0;
         $this->requestMock
-            ->expects($this->once())
+            ->expects($this->exactly(2))
             ->method('withHeader')
-            ->with('Content-Type', 'application/json; charset=utf-8')
-            ->willReturn($this->requestMock);
+            ->willReturnCallback(function (string $header, string $value) use (&$headerCallCount) {
+                if ($headerCallCount === 0) {
+                    $this->assertSame('Authorization', $header);
+                    $this->assertSame(self::FAKE_TOKEN, $value);
+                } elseif ($headerCallCount === 1) {
+                    $this->assertSame('Content-Type', $header);
+                    $this->assertSame('application/json; charset=utf-8', $value);
+                }
+
+                $headerCallCount++;
+
+                return $this->requestMock;
+            });
 
         $this->responseMock->method('getStatusCode')->willReturn(200);
         $this->streamMock->method('__toString')->willReturn(json_encode($responsePayload));
@@ -226,6 +243,12 @@ final class ClientTest extends TestCase
     public static function apiErrorProvider(): array
     {
         return [
+            '400 Attachment Not Ready' => [
+                400,
+                AttachmentNotReadyException::class,
+                'attachment.not.ready',
+                'Key: errors.process.attachment.file.not.processed',
+            ],
             '400 Bad Request' => [400, ClientApiException::class, 'bad.request', 'Invalid parameters'],
             '401 Unauthorized' => [401, UnauthorizedException::class, 'verify.token', 'Invalid access_token'],
             '403 Forbidden' => [403, ForbiddenException::class, 'access.denied', 'You don\'t have permissions'],
@@ -298,11 +321,23 @@ final class ClientTest extends TestCase
             )
             ->willReturn($this->requestMock);
 
+        $headerCallCount = 0;
         $this->requestMock
-            ->expects($this->once())
+            ->expects($this->exactly(2))
             ->method('withHeader')
-            ->with($this->stringStartsWith('Content-Type'), $this->stringStartsWith('multipart/form-data'))
-            ->willReturn($this->requestMock);
+            ->willReturnCallback(function (string $header, string $value) use (&$headerCallCount) {
+                if ($headerCallCount === 0) {
+                    $this->assertSame('Content-Type', $header);
+                    $this->assertStringStartsWith('multipart/form-data; boundary=', $value);
+                } elseif ($headerCallCount === 1) {
+                    $this->assertSame('Authorization', $header);
+                    $this->assertSame(self::FAKE_TOKEN, $value);
+                }
+
+                $headerCallCount++;
+
+                return $this->requestMock;
+            });
 
         $this->requestFactoryMock
             ->expects($this->once())
@@ -330,9 +365,26 @@ final class ClientTest extends TestCase
         rewind($tmpFileHandle);
 
         $this->requestFactoryMock->method('createRequest')->willReturn($this->requestMock);
-        $this->requestMock->method('withHeader')->willReturn($this->requestMock);
+
+        $headerCallCount = 0;
+        $this->requestMock
+            ->expects($this->exactly(2))
+            ->method('withHeader')
+            ->willReturnCallback(function (string $header, string $value) use (&$headerCallCount) {
+                if ($headerCallCount === 0) {
+                    $this->assertSame('Content-Type', $header);
+                    $this->assertStringStartsWith('multipart/form-data; boundary=', $value);
+                } elseif ($headerCallCount === 1) {
+                    $this->assertSame('Authorization', $header);
+                    $this->assertSame(self::FAKE_TOKEN, $value);
+                }
+
+                $headerCallCount++;
+
+                return $this->requestMock;
+            });
+
         $this->requestMock->method('withBody')->willReturn($this->requestMock);
-//        $this->httpClientMock->method('sendRequest')->willReturn($this->responseMock);
         $this->responseMock->method('getStatusCode')->willReturn(200);
         $this->streamMock->method('__toString')->willReturn(json_encode($responsePayload));
 
@@ -466,7 +518,30 @@ final class ClientTest extends TestCase
 
         $this->requestFactoryMock->method('createRequest')->willReturn($this->requestMock);
         $this->requestMock->method('withBody')->willReturnSelf();
-        $this->requestMock->method('withHeader')->willReturnSelf();
+
+        $headerCallCount = 0;
+        $this->requestMock
+            ->expects($this->exactly(4))
+            ->method('withHeader')
+            ->willReturnCallback(function (string $header, string $value) use (&$headerCallCount, $fileName, $fileSize) {
+                if ($headerCallCount === 0) {
+                    $this->assertSame('Content-Type', $header);
+                    $this->assertSame('application/octet-stream', $value);
+                } elseif ($headerCallCount === 1) {
+                    $this->assertSame('Content-Disposition', $header);
+                    $this->assertSame('attachment; filename="' . $fileName . '"', $value);
+                } elseif ($headerCallCount === 2) {
+                    $this->assertSame('Content-Range', $header);
+                    $this->assertSame("bytes 0-8/{$fileSize}", $value);
+                } elseif ($headerCallCount === 3) {
+                    $this->assertSame('Authorization', $header);
+                    $this->assertSame(self::FAKE_TOKEN, $value);
+                }
+
+                $headerCallCount++;
+
+                return $this->requestMock;
+            });
 
         $this->httpClientMock
             ->expects($this->once())
@@ -486,7 +561,8 @@ final class ClientTest extends TestCase
     #[Test]
     public function resumableUploadSuccessfullyUploadsMultipleChunks(): void
     {
-        $fileContents = str_repeat('A', 3 * 1024 * 1024); // 3 MB
+        $chunkSize = 1024 * 1024;
+        $fileContents = str_repeat('A', 3 * $chunkSize); // 3 MB
         $fileResource = fopen('php://memory', 'w+');
         fwrite($fileResource, $fileContents);
         rewind($fileResource);
@@ -513,7 +589,7 @@ final class ClientTest extends TestCase
             ->method('__toString')
             ->willReturnOnConsecutiveCalls('', '', '<retval>1</retval>');
 
-        $result = $this->client->resumableUpload($uploadUrl, $fileResource, $fileName, $fileSize, 1024 * 1024);
+        $result = $this->client->resumableUpload($uploadUrl, $fileResource, $fileName, $fileSize, $chunkSize);
 
         $this->assertSame('<retval>1</retval>', $result);
         fclose($fileResource);

tests/Laravel/MaxBotServiceProviderTest.php

@@ -38,6 +38,7 @@ use ReflectionClass;
 #[UsesClass(UpdateDispatcher::class)]
 #[UsesClass(MaxBotManager::class)]
 #[UsesClass(WebhookHandler::class)]
+#[UsesClass(ModelFactory::class)]
 final class MaxBotServiceProviderTest extends TestCase
 {
     use PHPMock;
@@ -92,6 +93,8 @@ final class MaxBotServiceProviderTest extends TestCase
     #[PreserveGlobalState(false)]
     public function itThrowsExceptionWhenGuzzleIsMissing(): void
     {
+        error_reporting(E_ALL & ~E_DEPRECATED);
+
         $this->expectException(LogicException::class);
         $this->expectExceptionMessage(
             'Guzzle HTTP client is required. Please run "composer require guzzlehttp/guzzle".'
@@ -210,6 +213,105 @@ final class MaxBotServiceProviderTest extends TestCase
         $this->assertInstanceOf(NullLogger::class, $actualLogger);
     }
 
+    #[Test]
+    public function modelFactoryIsConfiguredWithApplicationLoggerWhenLoggingIsEnabled(): void
+    {
+        $this->app['config']->set('maxbot.logging.enabled', true);
+
+        $mockLogger = $this->createMock(LoggerInterface::class);
+        $this->app->instance(LoggerInterface::class, $mockLogger);
+
+        /** @var ModelFactory $factory */
+        $factory = $this->app->make(ModelFactory::class);
+
+        $reflection = new ReflectionClass($factory);
+        $loggerProp = $reflection->getProperty('logger');
+        $actualLogger = $loggerProp->getValue($factory);
+
+        $this->assertSame($mockLogger, $actualLogger);
+    }
+
+    #[Test]
+    public function modelFactoryIsConfiguredWithNullLoggerWhenLoggingIsDisabled(): void
+    {
+        $this->app['config']->set('maxbot.logging.enabled', false);
+
+        /** @var ModelFactory $factory */
+        $factory = $this->app->make(ModelFactory::class);
+
+        $reflection = new ReflectionClass($factory);
+        $loggerProp = $reflection->getProperty('logger');
+        $actualLogger = $loggerProp->getValue($factory);
+
+        $this->assertInstanceOf(NullLogger::class, $actualLogger);
+    }
+
+    #[Test]
+    public function webhookHandlerIsConfiguredWithApplicationLoggerWhenLoggingIsEnabled(): void
+    {
+        $this->app['config']->set('maxbot.logging.enabled', true);
+
+        $mockLogger = $this->createMock(LoggerInterface::class);
+        $this->app->instance(LoggerInterface::class, $mockLogger);
+
+        /** @var WebhookHandler $handler */
+        $handler = $this->app->make(WebhookHandler::class);
+
+        $reflection = new ReflectionClass($handler);
+        $loggerProp = $reflection->getProperty('logger');
+        $actualLogger = $loggerProp->getValue($handler);
+
+        $this->assertSame($mockLogger, $actualLogger);
+    }
+
+    #[Test]
+    public function webhookHandlerIsConfiguredWithNullLoggerWhenLoggingIsDisabled(): void
+    {
+        $this->app['config']->set('maxbot.logging.enabled', false);
+
+        /** @var WebhookHandler $handler */
+        $handler = $this->app->make(WebhookHandler::class);
+
+        $reflection = new ReflectionClass($handler);
+        $loggerProp = $reflection->getProperty('logger');
+        $actualLogger = $loggerProp->getValue($handler);
+
+        $this->assertInstanceOf(NullLogger::class, $actualLogger);
+    }
+
+    #[Test]
+    public function longPollingHandlerIsConfiguredWithApplicationLoggerWhenLoggingIsEnabled(): void
+    {
+        $this->app['config']->set('maxbot.logging.enabled', true);
+
+        $mockLogger = $this->createMock(LoggerInterface::class);
+        $this->app->instance(LoggerInterface::class, $mockLogger);
+
+        /** @var LongPollingHandler $handler */
+        $handler = $this->app->make(LongPollingHandler::class);
+
+        $reflection = new ReflectionClass($handler);
+        $loggerProp = $reflection->getProperty('logger');
+        $actualLogger = $loggerProp->getValue($handler);
+
+        $this->assertSame($mockLogger, $actualLogger);
+    }
+
+    #[Test]
+    public function longPollingHandlerIsConfiguredWithNullLoggerWhenLoggingIsDisabled(): void
+    {
+        $this->app['config']->set('maxbot.logging.enabled', false);
+
+        /** @var LongPollingHandler $handler */
+        $handler = $this->app->make(LongPollingHandler::class);
+
+        $reflection = new ReflectionClass($handler);
+        $loggerProp = $reflection->getProperty('logger');
+        $actualLogger = $loggerProp->getValue($handler);
+
+        $this->assertInstanceOf(NullLogger::class, $actualLogger);
+    }
+
     #[Test]
     public function webhookHandlerIsConfiguredWithSecretFromConfig(): void
     {
@@ -238,10 +340,28 @@ final class MaxBotServiceProviderTest extends TestCase
 
         $this->assertSame($this->app->make(ClientApiInterface::class), $clientProp->getValue($api));
         $this->assertSame($this->app->make(ModelFactory::class), $factoryProp->getValue($api));
-        $this->assertSame($this->app->make(LoggerInterface::class), $loggerProp->getValue($api));
+        $this->assertInstanceOf(NullLogger::class, $loggerProp->getValue($api));
         $this->assertSame($this->app->make(UpdateDispatcher::class), $dispatcherProp->getValue($api));
     }
 
+    #[Test]
+    public function apiIsConfiguredWithApplicationLoggerWhenLoggingIsEnabled(): void
+    {
+        $this->app['config']->set('maxbot.logging.enabled', true);
+
+        $mockLogger = $this->createMock(LoggerInterface::class);
+        $this->app->instance(LoggerInterface::class, $mockLogger);
+
+        /** @var Api $api */
+        $api = $this->app->make(Api::class);
+
+        $reflection = new ReflectionClass($api);
+        $loggerProp = $reflection->getProperty('logger');
+        $actualLogger = $loggerProp->getValue($api);
+
+        $this->assertSame($mockLogger, $actualLogger);
+    }
+
     /**
      * @return array<string, array{0: string}>
      */

tests/ModelFactoryTest.php

@@ -59,6 +59,7 @@ use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\Attributes\Test;
 use PHPUnit\Framework\Attributes\UsesClass;
 use PHPUnit\Framework\TestCase;
+use Psr\Log\LoggerInterface;
 
 #[CoversClass(ModelFactory::class)]
 #[UsesClass(BotInfo::class)]
@@ -220,6 +221,36 @@ final class ModelFactoryTest extends TestCase
         $this->assertSame(UpdateType::MessageCreated, $subscriptions[0]->updateTypes[0]);
     }
 
+    #[Test]
+    public function createMessageFromSendResponseCorrectlyTransformsData(): void
+    {
+        $apiResponse = [
+            'message' => [
+                'recipient' => ['chat_id' => 20414985, 'chat_type' => 'dialog', 'user_id' => 4328369],
+                'timestamp' => 1760089962345,
+                'sender' => [
+                    'user_id' => 24480184,
+                    'first_name' => 'Autobot',
+                    'is_bot' => true,
+                    'last_activity_time' => 1760089962354,
+                ],
+                'message' => ['mid' => 'mid.xyz', 'seq' => 1153, 'text' => '123123'],
+            ],
+            'chat_id' => 20414985,
+            'recipient_id' => 4328369,
+            'message_id' => 'mid.xyz',
+        ];
+
+        $message = $this->factory->createMessageFromSendResponse($apiResponse);
+
+        $this->assertInstanceOf(Message::class, $message);
+        $this->assertInstanceOf(MessageBody::class, $message->body);
+        $this->assertSame('mid.xyz', $message->body->mid);
+        $this->assertSame(20414985, $message->chatId);
+        $this->assertSame(4328369, $message->recipientId);
+        $this->assertSame('mid.xyz', $message->messageId);
+    }
+
     #[Test]
     public function createMessage(): void
     {
@@ -788,4 +819,55 @@ final class ModelFactoryTest extends TestCase
 
         $assertionCallback($this, $attachment);
     }
+
+    #[Test]
+    public function createUpdateListCatchesAndLogsLogicException(): void
+    {
+        $loggerMock = $this->createMock(LoggerInterface::class);
+        $factory = $this->getMockBuilder(ModelFactory::class)
+            ->setConstructorArgs([$loggerMock])
+            ->onlyMethods(['createUpdate'])
+            ->getMock();
+
+        $validUpdateData = [
+            'update_type' => 'bot_started',
+            'timestamp' => 2,
+            'chat_id' => 123,
+            'user' => [
+                'user_id' => 123,
+                'first_name' => 'John',
+                'is_bot' => false,
+                'last_activity_time' => 2,
+            ],
+            'payload' => 'start_payload',
+            'user_locale' => 'ru-RU',
+        ];
+        $invalidUpdateData = ['update_type' => 'unknown_type'];
+        $rawData = [
+            'updates' => [$validUpdateData, $invalidUpdateData],
+            'marker' => 123,
+        ];
+
+        $exception = new LogicException('Unknown or unsupported update type received: unknown_type');
+        $factory->expects($this->exactly(2))
+            ->method('createUpdate')
+            ->willReturnCallback(function ($data) use ($validUpdateData, $invalidUpdateData, $exception) {
+                if ($data === $validUpdateData) {
+                    return BotStartedUpdate::fromArray($data);
+                }
+                if ($data === $invalidUpdateData) {
+                    throw $exception;
+                }
+                return null;
+            });
+
+        $loggerMock->expects($this->once())
+            ->method('debug')
+            ->with($exception->getMessage(), ['payload' => $invalidUpdateData, 'exception' => $exception]);
+
+        $updateList = $factory->createUpdateList($rawData);
+
+        $this->assertCount(1, $updateList->updates);
+        $this->assertInstanceOf(BotStartedUpdate::class, $updateList->updates[0]);
+    }
 }

tests/Models/Attachments/Payloads/PhotoAttachmentRequestPayloadTest.php

@@ -9,7 +9,6 @@ use BushlanovDev\MaxMessengerBot\Models\Attachments\Payloads\PhotoAttachmentRequ
 use BushlanovDev\MaxMessengerBot\Models\Attachments\Payloads\PhotoToken;
 use InvalidArgumentException;
 use PHPUnit\Framework\Attributes\CoversClass;
-use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\Attributes\Test;
 use PHPUnit\Framework\Attributes\UsesClass;
 use PHPUnit\Framework\TestCase;
@@ -77,32 +76,12 @@ final class PhotoAttachmentRequestPayloadTest extends TestCase
         $this->assertEquals($expectedArray, $payload->toArray());
     }
 
-    /**
-     * Data provider for invalid constructor arguments.
-     *
-     * @return array<string, array{0: string|null, 1: string|null, 2: array|null}>
-     */
-    public static function invalidPayloadProvider(): array
-    {
-        return [
-            'all null (no arguments)' => [null, null, null],
-            'url and token provided' => ['https://a.com', 'token123', null],
-            'url and photos provided' => ['https://a.com', null, [new PhotoToken('t')]],
-            'token and photos provided' => [null, 'token123', [new PhotoToken('t')]],
-            'all three arguments provided' => ['https://a.com', 'token123', [new PhotoToken('t')]],
-        ];
-    }
-
     #[Test]
-    #[DataProvider('invalidPayloadProvider')]
-    public function constructorThrowsExceptionForInvalidArguments(
-        ?string $url,
-        ?string $token,
-        ?array $photos
-    ): void {
+    public function constructorThrowsExceptionForInvalidArguments(): void
+    {
         $this->expectException(InvalidArgumentException::class);
-        $this->expectExceptionMessage('Provide exactly one of "url", "token", or "photos" for PhotoAttachmentRequestPayload.');
+        $this->expectExceptionMessage('Provide one of "url", "token", or "photos" for PhotoAttachmentRequestPayload.');
 
-        new PhotoAttachmentRequestPayload($url, $token, $photos);
+        new PhotoAttachmentRequestPayload(null, null, null);
     }
 }

tests/Models/Attachments/Payloads/ShareAttachmentRequestPayloadTest.php

@@ -38,24 +38,12 @@ final class ShareAttachmentRequestPayloadTest extends TestCase
         $this->assertEquals($expectedArray, $payload->toArray());
     }
 
-    /**
-     * @return array<string, array{0: ?string, 1: ?string}>
-     */
-    public static function invalidPayloadProvider(): array
-    {
-        return [
-            'both null' => [null, null],
-            'both set' => ['https://a.com', 'token123'],
-        ];
-    }
-
     #[Test]
-    #[DataProvider('invalidPayloadProvider')]
-    public function constructorThrowsExceptionForInvalidArguments(?string $url, ?string $token): void
+    public function constructorThrowsExceptionForInvalidArguments(): void
     {
         $this->expectException(InvalidArgumentException::class);
-        $this->expectExceptionMessage('Provide exactly one of "url" or "token" for ShareAttachmentRequestPayload.');
+        $this->expectExceptionMessage('Provide one of "url" or "token" for ShareAttachmentRequestPayload.');
 
-        new ShareAttachmentRequestPayload($url, $token);
+        new ShareAttachmentRequestPayload(null, null);
     }
 }

tests/Models/Attachments/Requests/PhotoAttachmentRequestTest.php

@@ -98,29 +98,12 @@ final class PhotoAttachmentRequestTest extends TestCase
         $this->assertEquals($expectedArray, $request->toArray());
     }
 
-    /**
-     * @return array<string, array{0: string|null, 1: string|null, 2: array|null}>
-     */
-    public static function invalidPayloadProvider(): array
-    {
-        return [
-            'no arguments' => [null, null, null],
-            'url and token' => ['http://a.com', 'token123', null],
-            'token and photos' => [null, 'token123', [new PhotoToken('t')]],
-            'all arguments' => ['http://a.com', 'token123', [new PhotoToken('t')]],
-        ];
-    }
-
     #[Test]
-    #[DataProvider('invalidPayloadProvider')]
-    public function payloadThrowsExceptionWhenNotExactlyOneArgumentIsProvided(
-        ?string $url,
-        ?string $token,
-        ?array $photos
-    ): void {
+    public function payloadThrowsExceptionWhenNotExactlyOneArgumentIsProvided(): void
+    {
         $this->expectException(InvalidArgumentException::class);
-        $this->expectExceptionMessage('Provide exactly one of "url", "token", or "photos" for PhotoAttachmentRequestPayload.');
+        $this->expectExceptionMessage('Provide one of "url", "token", or "photos" for PhotoAttachmentRequestPayload.');
 
-        new PhotoAttachmentRequestPayload($url, $token, $photos);
+        new PhotoAttachmentRequestPayload(null, null, null);
     }
 }

tests/Models/Attachments/Requests/ShareAttachmentRequestTest.php

@@ -9,7 +9,6 @@ use BushlanovDev\MaxMessengerBot\Models\Attachments\Payloads\ShareAttachmentRequ
 use BushlanovDev\MaxMessengerBot\Models\Attachments\Requests\ShareAttachmentRequest;
 use InvalidArgumentException;
 use PHPUnit\Framework\Attributes\CoversClass;
-use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\Attributes\Test;
 use PHPUnit\Framework\Attributes\UsesClass;
 use PHPUnit\Framework\TestCase;
@@ -42,21 +41,11 @@ final class ShareAttachmentRequestTest extends TestCase
         $this->assertEquals($expected, $request->toArray());
     }
 
-    /** @return array<string, array{0: ?string, 1: ?string}> */
-    public static function invalidPayloadProvider(): array
-    {
-        return [
-            'both null' => [null, null],
-            'both set' => ['https://a.com', 'token123'],
-        ];
-    }
-
     #[Test]
-    #[DataProvider('invalidPayloadProvider')]
-    public function payloadThrowsExceptionForInvalidArguments(?string $url, ?string $token): void
+    public function payloadThrowsExceptionForInvalidArguments(): void
     {
         $this->expectException(InvalidArgumentException::class);
-        $this->expectExceptionMessage('Provide exactly one of "url" or "token" for ShareAttachmentRequestPayload.');
-        new ShareAttachmentRequestPayload($url, $token);
+        $this->expectExceptionMessage('Provide one of "url" or "token" for ShareAttachmentRequestPayload.');
+        new ShareAttachmentRequestPayload(null, null);
     }
 }

tests/Models/MessageTest.php

@@ -64,6 +64,9 @@ final class MessageTest extends TestCase
             'stat' => [
                 'views' => 500,
             ],
+            'chat_id' => null,
+            'recipient_id' => null,
+            'message_id' => null,
         ];
 
         $message = Message::fromArray($data);

tests/Models/Updates/BotStoppedUpdateTest.php

@@ -0,0 +1,45 @@
+<?php
+
+declare(strict_types=1);
+
+namespace BushlanovDev\MaxMessengerBot\Tests\Models\Updates;
+
+use BushlanovDev\MaxMessengerBot\Enums\UpdateType;
+use BushlanovDev\MaxMessengerBot\Models\Updates\BotStoppedUpdate;
+use BushlanovDev\MaxMessengerBot\Models\User;
+use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Test;
+use PHPUnit\Framework\Attributes\UsesClass;
+use PHPUnit\Framework\TestCase;
+
+#[CoversClass(BotStoppedUpdate::class)]
+#[UsesClass(User::class)]
+final class BotStoppedUpdateTest extends TestCase
+{
+    #[Test]
+    public function canBeCreatedFromArray(): void
+    {
+        $data = [
+            'update_type' => UpdateType::BotStopped->value,
+            'timestamp' => 1678886400000,
+            'chat_id' => 123,
+            'user' => [
+                'user_id' => 123,
+                'first_name' => 'John',
+                'last_name' => 'Doe',
+                'is_bot' => false,
+                'last_activity_time' => 1678886400000,
+            ],
+            'user_locale' => 'ru-ru',
+        ];
+
+        $update = BotStoppedUpdate::fromArray($data);
+
+        $this->assertInstanceOf(BotStoppedUpdate::class, $update);
+        $this->assertSame(UpdateType::BotStopped, $update->updateType);
+        $this->assertSame(123, $update->user->userId);
+        $this->assertSame('John', $update->user->firstName);
+        $this->assertSame('Doe', $update->user->lastName);
+        $this->assertSame('ru-ru', $update->userLocale);
+    }
+}

tests/Models/Updates/DialogClearedUpdateTest.php

@@ -0,0 +1,45 @@
+<?php
+
+declare(strict_types=1);
+
+namespace BushlanovDev\MaxMessengerBot\Tests\Models\Updates;
+
+use BushlanovDev\MaxMessengerBot\Enums\UpdateType;
+use BushlanovDev\MaxMessengerBot\Models\Updates\DialogClearedUpdate;
+use BushlanovDev\MaxMessengerBot\Models\User;
+use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Test;
+use PHPUnit\Framework\Attributes\UsesClass;
+use PHPUnit\Framework\TestCase;
+
+#[CoversClass(DialogClearedUpdate::class)]
+#[UsesClass(User::class)]
+final class DialogClearedUpdateTest extends TestCase
+{
+    #[Test]
+    public function canBeCreatedFromArray(): void
+    {
+        $data = [
+            'update_type' => UpdateType::DialogCleared->value,
+            'timestamp' => 1678886400000,
+            'chat_id' => 123,
+            'user' => [
+                'user_id' => 123,
+                'first_name' => 'John',
+                'last_name' => 'Doe',
+                'is_bot' => false,
+                'last_activity_time' => 1678886400000,
+            ],
+            'user_locale' => 'ru-ru',
+        ];
+
+        $update = DialogClearedUpdate::fromArray($data);
+
+        $this->assertInstanceOf(DialogClearedUpdate::class, $update);
+        $this->assertSame(UpdateType::DialogCleared, $update->updateType);
+        $this->assertSame(123, $update->user->userId);
+        $this->assertSame('John', $update->user->firstName);
+        $this->assertSame('Doe', $update->user->lastName);
+        $this->assertSame('ru-ru', $update->userLocale);
+    }
+}

tests/Models/Updates/DialogMutedUpdateTest.php

@@ -0,0 +1,47 @@
+<?php
+
+declare(strict_types=1);
+
+namespace BushlanovDev\MaxMessengerBot\Tests\Models\Updates;
+
+use BushlanovDev\MaxMessengerBot\Enums\UpdateType;
+use BushlanovDev\MaxMessengerBot\Models\Updates\DialogMutedUpdate;
+use BushlanovDev\MaxMessengerBot\Models\User;
+use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Test;
+use PHPUnit\Framework\Attributes\UsesClass;
+use PHPUnit\Framework\TestCase;
+
+#[CoversClass(DialogMutedUpdate::class)]
+#[UsesClass(User::class)]
+final class DialogMutedUpdateTest extends TestCase
+{
+    #[Test]
+    public function canBeCreatedFromArray(): void
+    {
+        $data = [
+            'update_type' => UpdateType::DialogMuted->value,
+            'timestamp' => 1678886400000,
+            'chat_id' => 123,
+            'user' => [
+                'user_id' => 123,
+                'first_name' => 'John',
+                'last_name' => 'Doe',
+                'is_bot' => false,
+                'last_activity_time' => 1678886400000,
+            ],
+            'muted_until' => 1678886400000,
+            'user_locale' => 'ru-ru',
+        ];
+
+        $update = DialogMutedUpdate::fromArray($data);
+
+        $this->assertInstanceOf(DialogMutedUpdate::class, $update);
+        $this->assertSame(UpdateType::DialogMuted, $update->updateType);
+        $this->assertSame(123, $update->user->userId);
+        $this->assertSame('John', $update->user->firstName);
+        $this->assertSame('Doe', $update->user->lastName);
+        $this->assertSame(1678886400000, $update->mutedUntil);
+        $this->assertSame('ru-ru', $update->userLocale);
+    }
+}

tests/Models/Updates/DialogRemovedUpdateTest.php

@@ -0,0 +1,45 @@
+<?php
+
+declare(strict_types=1);
+
+namespace BushlanovDev\MaxMessengerBot\Tests\Models\Updates;
+
+use BushlanovDev\MaxMessengerBot\Enums\UpdateType;
+use BushlanovDev\MaxMessengerBot\Models\Updates\DialogRemovedUpdate;
+use BushlanovDev\MaxMessengerBot\Models\User;
+use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Test;
+use PHPUnit\Framework\Attributes\UsesClass;
+use PHPUnit\Framework\TestCase;
+
+#[CoversClass(DialogRemovedUpdate::class)]
+#[UsesClass(User::class)]
+final class DialogRemovedUpdateTest extends TestCase
+{
+    #[Test]
+    public function canBeCreatedFromArray(): void
+    {
+        $data = [
+            'update_type' => UpdateType::DialogRemoved->value,
+            'timestamp' => 1678886400000,
+            'chat_id' => 123,
+            'user' => [
+                'user_id' => 123,
+                'first_name' => 'John',
+                'last_name' => 'Doe',
+                'is_bot' => false,
+                'last_activity_time' => 1678886400000,
+            ],
+            'user_locale' => 'ru-ru',
+        ];
+
+        $update = DialogRemovedUpdate::fromArray($data);
+
+        $this->assertInstanceOf(DialogRemovedUpdate::class, $update);
+        $this->assertSame(UpdateType::DialogRemoved, $update->updateType);
+        $this->assertSame(123, $update->user->userId);
+        $this->assertSame('John', $update->user->firstName);
+        $this->assertSame('Doe', $update->user->lastName);
+        $this->assertSame('ru-ru', $update->userLocale);
+    }
+}

tests/Models/Updates/DialogUnmutedUpdateTest.php

@@ -0,0 +1,45 @@
+<?php
+
+declare(strict_types=1);
+
+namespace BushlanovDev\MaxMessengerBot\Tests\Models\Updates;
+
+use BushlanovDev\MaxMessengerBot\Enums\UpdateType;
+use BushlanovDev\MaxMessengerBot\Models\Updates\DialogUnmutedUpdate;
+use BushlanovDev\MaxMessengerBot\Models\User;
+use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Test;
+use PHPUnit\Framework\Attributes\UsesClass;
+use PHPUnit\Framework\TestCase;
+
+#[CoversClass(DialogUnmutedUpdate::class)]
+#[UsesClass(User::class)]
+final class DialogUnmutedUpdateTest extends TestCase
+{
+    #[Test]
+    public function canBeCreatedFromArray(): void
+    {
+        $data = [
+            'update_type' => UpdateType::DialogUnmuted->value,
+            'timestamp' => 1678886400000,
+            'chat_id' => 123,
+            'user' => [
+                'user_id' => 123,
+                'first_name' => 'John',
+                'last_name' => 'Doe',
+                'is_bot' => false,
+                'last_activity_time' => 1678886400000,
+            ],
+            'user_locale' => 'ru-ru',
+        ];
+
+        $update = DialogUnmutedUpdate::fromArray($data);
+
+        $this->assertInstanceOf(DialogUnmutedUpdate::class, $update);
+        $this->assertSame(UpdateType::DialogUnmuted, $update->updateType);
+        $this->assertSame(123, $update->user->userId);
+        $this->assertSame('John', $update->user->firstName);
+        $this->assertSame('Doe', $update->user->lastName);
+        $this->assertSame('ru-ru', $update->userLocale);
+    }
+}

tests/WebhookHandlerTest.php

@@ -185,4 +185,43 @@ final class WebhookHandlerTest extends TestCase
         $handler = new WebhookHandler($this->dispatcher, $this->modelFactoryMock, $this->loggerMock, null);
         $handler->handle(null);
     }
+
+    #[Test]
+    public function handleCatchesAndLogsLogicExceptionFromModelFactory(): void
+    {
+        $payload = '{"update_type":"unknown_type","timestamp":123}';
+        $updateData = json_decode($payload, true);
+        $exception = new LogicException('Unknown or unsupported update type received: unknown_type');
+
+        $request = $this->createMockRequest($payload, self::SECRET);
+
+        $this->modelFactoryMock->expects($this->once())
+            ->method('createUpdate')
+            ->with($updateData)
+            ->willThrowException($exception);
+
+        $callIndex = 0;
+        $this->loggerMock->expects($this->exactly(2))
+            ->method('debug')
+            ->willReturnCallback(
+                function (string $message, array $context = []) use (&$callIndex, $payload, $exception) {
+                    if ($callIndex === 0) {
+                        $this->assertSame('Received webhook payload', $message);
+                        $this->assertArrayHasKey('body', $context);
+                        $this->assertSame($payload, $context['body']);
+                    } elseif ($callIndex === 1) {
+                        $this->assertSame('Unknown or unsupported update type received: unknown_type', $message);
+                        $this->assertArrayHasKey('payload', $context);
+                        $this->assertArrayHasKey('exception', $context);
+                        $this->assertSame($payload, $context['payload']);
+                        $this->assertSame($exception, $context['exception']);
+                    }
+                    $callIndex++;
+                }
+            );
+
+        $handler = new WebhookHandler($this->dispatcher, $this->modelFactoryMock, $this->loggerMock, self::SECRET);
+
+        $handler->handle($request);
+    }
 }

tests/bootstrap.php

@@ -0,0 +1,5 @@
+<?php
+
+error_reporting(E_ALL & ~E_DEPRECATED);
+
+require_once dirname(__DIR__) . '/vendor/autoload.php';