From 657ff7f91635242527d06380e51e7274caa3b5d2 Mon Sep 17 00:00:00 2001 From: Jordi Boggiano Date: Sat, 5 Mar 2022 14:22:06 +0100 Subject: [PATCH] Drop support for aws-php-sdk v2 from DynamoDbHandler --- composer.json | 2 +- src/Monolog/Handler/DynamoDbHandler.php | 20 ++------------------ 2 files changed, 3 insertions(+), 19 deletions(-) diff --git a/composer.json b/composer.json index 341bb181..888fc88a 100644 --- a/composer.json +++ b/composer.json @@ -17,7 +17,7 @@ "psr/log": "^2.0 || ^3.0" }, "require-dev": { - "aws/aws-sdk-php": "^2.4.9 || ^3.0", + "aws/aws-sdk-php": "^3.0", "doctrine/couchdb": "~1.0@dev", "elasticsearch/elasticsearch": "^7", "mongodb/mongodb": "^1.8", diff --git a/src/Monolog/Handler/DynamoDbHandler.php b/src/Monolog/Handler/DynamoDbHandler.php index b154d143..175ab71b 100644 --- a/src/Monolog/Handler/DynamoDbHandler.php +++ b/src/Monolog/Handler/DynamoDbHandler.php @@ -39,11 +39,6 @@ class DynamoDbHandler extends AbstractProcessingHandler */ protected $table; - /** - * @var int - */ - protected $version; - /** * @var Marshaler */ @@ -51,13 +46,7 @@ class DynamoDbHandler extends AbstractProcessingHandler public function __construct(DynamoDbClient $client, string $table, $level = Logger::DEBUG, bool $bubble = true) { - /** @phpstan-ignore-next-line */ - if (defined('Aws\Sdk::VERSION') && version_compare(Sdk::VERSION, '3.0', '>=')) { - $this->version = 3; - $this->marshaler = new Marshaler; - } else { - $this->version = 2; - } + $this->marshaler = new Marshaler; $this->client = $client; $this->table = $table; @@ -71,12 +60,7 @@ class DynamoDbHandler extends AbstractProcessingHandler protected function write(LogRecord $record): void { $filtered = $this->filterEmptyFields($record->formatted); - if ($this->version === 3) { - $formatted = $this->marshaler->marshalItem($filtered); - } else { - /** @phpstan-ignore-next-line */ - $formatted = $this->client->formatAttributes($filtered); - } + $formatted = $this->marshaler->marshalItem($filtered); $this->client->putItem([ 'TableName' => $this->table,